package/systemd: invoke systemd-tmpfilesd on final image
PATCH v2 1/1 package/systemd: invoke systemd-tmpfilesd on final image
Especially for read-only filesystems it is helpfull to pre-create all folders for non-volatile paths.
This needs to run under fakeroot to allow setting
uids/gids/perms for the target fs.
As systemd-tmpfilesd also supports specifiers, but so far only resolves those from the host, it is necessary to specially handle entries that contain problematic specifiers.
Entries containing problematic specifiers are either skipped, but in some cases its possible to instead manually replace them with correct replacements from the target.
---v1->v2
* add a script to skip/handle specifiers that might
otherwise take information from the host
package/systemd: tmpfilesv2
--- package/systemd/fakeroot_tmpfiles.sh | 66 ++++++++++++++++++++++++++++ package/systemd/systemd.mk | 9 +++- 2 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 package/systemd/fakeroot_tmpfiles.sh
package/systemd/fakeroot_tmpfiles.sh new file +66 -0
@@ -0,0 +1,66 @@ +#!/bin/sh +# +# until a solution like [1] is upstreamed, +# its necessary to mask out specs which will infer properties +# from the host. +# +# TMPDIR= TEMP= TMP= makes sure %T and %V are set to the default +# +# shell expansion is critical to be POSIX compliant, +# this script wont work with zsh in its default mode for example. +# +# The script takes everal measures to handle more complex stuff +# like passing this correctly: +# f+ "/var/example" - - - - %B\n%o\n%w\n%W%%\n +# +# [1] - https://github.com/systemd/systemd/issues/16183 + +[ -n "${HOST_SYSTEMD_TMPFILES-}" ] || + HOST_SYSTEMD_TMPFILES=systemd-tmpfiles + +[ -n "${1-}" -a -d "${1-}"/usr/lib/tmpfiles.d ] || + { echo 1>&2 "$0: need ROOTFS argument"; exit 1; } + +# read OS specific variables from file, +# buildroot already wrote this in target-finalize, +# users might replace it by using an overlay +BUILD_ID=; ID=; VERSION_ID=; VARIANT_ID=; +for f in /etc/os-release /usr/lib/os-release; do + # dont blindly set all variables, only pick the ones we need + [ -r "$1"/$f ] && + eval "$(sed -n -e '/^BUILD_ID=/p' -e '/^ID=/p' -e '/^VERSION_ID=/p' -e '/^VARIANT_ID=/p' "$1"/$f)" && + break +done + +${HOST_SYSTEMD_TMPFILES} --no-pager --cat-config --root="$1" | + sed -e '/^[[:space:]]*#/d' -e 's,^[[:space:]]*,,' -e '/^$/d' | + while read -r line; do + # it is allowed to use quotes around arguments, + # so let the shell pack the arguments + eval "set -- $line" + + # dont output warnings for directories we dont process + [ "${2#/dev}" = "${2}" ] && [ "${2#/dev}" = "${2}" ] && + [ "${2#/run}" = "${2}" ] && [ "${2#/sys}" = "${2}" ] && + [ "${2#/tmp}" = "${2}" ] && [ "${2#/mnt}" = "${2}" ] || + continue + + # blank out all specs that are ok to use, + # test if some remain + if echo "$2 ${7-}" | sed -e 's,%[%ChLStTgGuUV],,g' | grep -v -q '%'; then + # no "bad" specifiers, pass the line unmodified + eval "printf '%s\n' '$line'" + elif echo "$2 ${7-}" | sed -e 's,%[%ChLStTgGuUVBowW],,g' | grep -v -q '%'; then + # something we can fix + eval "printf '%s\n' '$line'" | + sed -e "s#%B#$BUILD_ID#g" -e "s#%o#$ID#g" -e "s#%w#$VERSION_ID#g" -e "s#%W#$VARIANT_ID#g" + else + # warn + eval "printf 'ignored spec: %s\n' '$line' 1>&2" + fi + done | +\ +TMPDIR= TEMP= TMP= ${HOST_SYSTEMD_TMPFILES} --create --boot --root="$1" \ + --exclude-prefix=/dev --exclude-prefix=/proc --exclude-prefix=/run --exclude-prefix=/sys \ + --exclude-prefix=/tmp --exclude-prefix=/mnt \ + -
package/systemd/systemd.mk +7 -2
@@ -654,10 +654,15 @@ endef SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE +define SYSTEMD_CREATE_TMPFILES_HOOK + HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ + /bin/sh $(SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) +endef + define SYSTEMD_PRESET_ALL $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all endef -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_PRESET_ALL +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK SYSTEMD_PRESET_ALL SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV)
@@ -717,7 +722,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dvconsole=false \ -Dquotacheck=false \ -Dsysusers=false \ - -Dtmpfiles=false \ + -Dtmpfiles=true \ -Dimportd=false \ -Dhwdb=false \ -Drfkill=false \
Signature · 1 line
2.29.2
Le 26/11/2020 à 15:47, Norbert Lange a écrit :
Quoted 42 lines
Especially for read-only filesystems it is helpfull to pre-create all folders for non-volatile paths.
This needs to run under fakeroot to allow setting
uids/gids/perms for the target fs.As systemd-tmpfilesd also supports specifiers, but so far only resolves those from the host, it is necessary to specially handle entries that contain problematic specifiers.
Entries containing problematic specifiers are either skipped, but in some cases its possible to instead manually replace them with correct replacements from the target.
Signed-off-by Norbert Lange <[email protected]>---
v1->v2
* add a script to skip/handle specifiers that might
otherwise take information from the hostpackage/systemd: tmpfilesv2
Signed-off-by Norbert Lange <[email protected]>--- package/systemd/fakeroot_tmpfiles.sh | 66 ++++++++++++++++++++++++++++ package/systemd/systemd.mk | 9 +++- 2 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 package/systemd/fakeroot_tmpfiles.shpackage/systemd/fakeroot_tmpfiles.sh new file +6
-0@@ -0,0 +1,66 @@ +#!/bin/sh +# +# until a solution like [1] is upstreamed, +# its necessary to mask out specs which will infer properties +# from the host. +#
package/systemd/fakeroot_tmpfiles.sh line 16
Quoted 10 lines
package/systemd/fakeroot_tmpfiles.sh new file +10
-0+# TMPDIR= TEMP= TMP= makes sure %T and %V are set to the default +# +# shell expansion is critical to be POSIX compliant, +# this script wont work with zsh in its default mode for example. +# +# The script takes everal measures to handle more complex stuff +# like passing this correctly: +# f+ "/var/example" - - - - %B\n%o\n%w\n%W%%\n +# +# [1] - https://github.com/systemd/systemd/issues/16183
It seems that systemd now include what you need since version 249 containing the commit [1].
The fakeroot_tmpfiles.sh script seems not neceesary anymore.
[1]
https://github.com/systemd/systemd/commit/de61a04b188f81a85cdb5c64ddb4987dcd9d30d3
Best regards,
Romain
Quoted 73 lines
package/systemd/fakeroot_tmpfiles.sh new file +50
-0+ +[ -n "${HOST_SYSTEMD_TMPFILES-}" ] || + HOST_SYSTEMD_TMPFILES=systemd-tmpfiles + +[ -n "${1-}" -a -d "${1-}"/usr/lib/tmpfiles.d ] || + { echo 1>&2 "$0: need ROOTFS argument"; exit 1; } + +# read OS specific variables from file, +# buildroot already wrote this in target-finalize, +# users might replace it by using an overlay +BUILD_ID=; ID=; VERSION_ID=; VARIANT_ID=; +for f in /etc/os-release /usr/lib/os-release; do + # dont blindly set all variables, only pick the ones we need + [ -r "$1"/$f ] && + eval "$(sed -n -e '/^BUILD_ID=/p' -e '/^ID=/p' -e '/^VERSION_ID=/p' -e '/^VARIANT_ID=/p' "$1"/$f)" && + break +done + +${HOST_SYSTEMD_TMPFILES} --no-pager --cat-config --root="$1" | + sed -e '/^[[:space:]]*#/d' -e 's,^[[:space:]]*,,' -e '/^$/d' | + while read -r line; do + # it is allowed to use quotes around arguments, + # so let the shell pack the arguments + eval "set -- $line" + + # dont output warnings for directories we dont process + [ "${2#/dev}" = "${2}" ] && [ "${2#/dev}" = "${2}" ] && + [ "${2#/run}" = "${2}" ] && [ "${2#/sys}" = "${2}" ] && + [ "${2#/tmp}" = "${2}" ] && [ "${2#/mnt}" = "${2}" ] || + continue + + # blank out all specs that are ok to use, + # test if some remain + if echo "$2 ${7-}" | sed -e 's,%[%ChLStTgGuUV],,g' | grep -v -q '%'; then + # no "bad" specifiers, pass the line unmodified + eval "printf '%s\n' '$line'" + elif echo "$2 ${7-}" | sed -e 's,%[%ChLStTgGuUVBowW],,g' | grep -v -q '%'; then + # something we can fix + eval "printf '%s\n' '$line'" | + sed -e "s#%B#$BUILD_ID#g" -e "s#%o#$ID#g" -e "s#%w#$VERSION_ID#g" -e "s#%W#$VARIANT_ID#g" + else + # warn + eval "printf 'ignored spec: %s\n' '$line' 1>&2" + fi + done | +\ +TMPDIR= TEMP= TMP= ${HOST_SYSTEMD_TMPFILES} --create --boot --root="$1" \ + --exclude-prefix=/dev --exclude-prefix=/proc --exclude-prefix=/run --exclude-prefix=/sys \ + --exclude-prefix=/tmp --exclude-prefix=/mnt \ + -package/systemd/systemd.mk +6
-1@@ -654,10 +654,15 @@ endef SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE +define SYSTEMD_CREATE_TMPFILES_HOOK + HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ + /bin/sh $(SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) +endef + define SYSTEMD_PRESET_ALL $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all endef -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_PRESET_ALL +SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK SYSTEMD_PRESET_ALL SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV) SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV)
package/systemd/systemd.mk HOST_SYSTEMD_CONF_OPTS = \ · line 728
Quoted 8 lines
package/systemd/systemd.mk +1
-1@@ -717,7 +722,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dvconsole=false \ -Dquotacheck=false \ -Dsysusers=false \ - -Dtmpfiles=false \ + -Dtmpfiles=true \ -Dimportd=false \ -Dhwdb=false \ -Drfkill=false \
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Hello Norbert,
Quoted 10 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+# +# [1] - https://github.com/systemd/systemd/issues/16183It seems that systemd now include what you need since version 249 containing the commit [1].
The
fakeroot_tmpfiles.shscript seems not neceesary anymore.[1]
https://github.com/systemd/systemd/commit/de61a04b188f81a85cdb5c64ddb4987dcd9d30d3
I have marked this patch as "Changes Requested".
Best regards,
Romain
Quoted 5 lines
Best regards,
Romain
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Am Sa., 8. Jan. 2022 um 14:42 Uhr schrieb Romain Naour <[email protected]>:
Quoted 10 lines
Hello Norbert,
Quoted 7 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+# +# [1] - https://github.com/systemd/systemd/issues/16183It seems that systemd now include what you need since version 249 containing the commit [1].
The
fakeroot_tmpfiles.shscript seems not neceesary anymore.
It is, this particular change did *not* get upstreamed, see [1]. Runtime specifiers might leak
to places they should not, the script is necessary to filter out those dangerous specs.
Some discussion was at [2].
Quoted 14 lines
I have marked this patch as "Changes Requested".
Best regards,
RomainQuoted 5 lines
Best regards,
Romain
Norbert
[1] - https://github.com/systemd/systemd/pull/16187
[2] - https://lists.buildroot.org/pipermail/buildroot/2020-June/587414.html
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Le 08/01/2022 à 15:44, Norbert Lange a écrit :
Quoted 10 lines
Am Sa., 8. Jan. 2022 um 14:42 Uhr schrieb Romain Naour <[email protected]>:
Quoted 9 lines
Hello Norbert,
Quoted 6 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+# +# [1] - https://github.com/systemd/systemd/issues/16183It seems that systemd now include what you need since version 249 containing the commit [1].
Quoted 7 lines
Quoted 1 line
Quoted 1 line
The
fakeroot_tmpfiles.shscript seems not neceesary anymore.It is, this particular change did *not* get upstreamed, see [1]. Runtime specifiers might leak
to places they should not, the script is necessary to filter out those dangerous specs.
Some discussion was at [2].
Ok, can you respin this patch with at least an updated comment in the script. We are now using systemd 250.1 and the issue in the comment has been closed by upstream.
Best regards,
Romain
Quoted 16 lines
Quoted 15 lines
I have marked this patch as "Changes Requested".
Best regards,
RomainQuoted 5 lines
Best regards,
Romain
Quoted 5 lines
Norbert
[1] - https://github.com/systemd/systemd/pull/16187
[2] - https://lists.buildroot.org/pipermail/buildroot/2020-June/587414.html
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot