From 8849dd8d1a74a46cb761c4d8041e4582d4686724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= Date: Wed, 5 May 2021 09:41:02 +0000 Subject: [PATCH] fix: add a missing tmpfilesconfdir global variable Adding a missing tmpfilesconfdir global variable --- dracut.sh | 8 +++++++- modules.d/01systemd-tmpfiles/module-setup.sh | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dracut.sh b/dracut.sh index c19606ae5e..ff622dde16 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1768,6 +1768,11 @@ if ! [[ -d $dracutsysrootdir$tmpfilesdir ]]; then [[ -d $dracutsysrootdir/usr/lib/tmpfiles.d ]] && tmpfilesdir=/usr/lib/tmpfiles.d fi +[[ -d $dracutsysrootdir$tmpfilesconfdir ]] \ + || tmpfilesconfdir=$(pkg-config systemd --variable=tmpfilesconfdir 2> /dev/null) + +[[ -d $dracutsysrootdir$tmpfilesconfdir ]] || tmpfilesconfdir=/etc/tmpfiles.d + [[ -d $dracutsysrootdir$depmodd ]] \ || sysctld=$(pkg-config libkmod --variable=depmodd 2> /dev/null) @@ -1794,7 +1799,8 @@ export initdir dracutbasedir \ modulesloadconfdir sysctl sysctlconfdir sysusers sysusersconfdir \ systemdutildir systemdutilconfdir systemdcatalog systemdntpunits \ systemdntpunitsconfdir systemdsystemunitdir systemdsystemconfdir \ - hostonly_cmdline loginstall tmpfilesdir depmodd depmodconfdir + hostonly_cmdline loginstall tmpfilesdir tmpfilesconfdir depmodd \ + depmodconfdir mods_to_load="" # check all our modules to see if they should be sourced. diff --git a/modules.d/01systemd-tmpfiles/module-setup.sh b/modules.d/01systemd-tmpfiles/module-setup.sh index 2bf97ec260..6c3a37a80e 100755 --- a/modules.d/01systemd-tmpfiles/module-setup.sh +++ b/modules.d/01systemd-tmpfiles/module-setup.sh @@ -33,7 +33,6 @@ install() { # Excluding "$tmpfilesdir/systemd-pstore.conf", belongs in seperated pstore module # Excluding "$tmpfilesdir/x11.conf", belongs in seperated x11 module - inst_multiple -o \ /usr/lib/group \ /usr/lib/passwd \