diff options
author | Jóhann B. Guðmundsson <johannbg@gmail.com> | 2021-05-05 09:41:02 +0000 |
---|---|---|
committer | Harald Hoyer <harald@hoyer.xyz> | 2021-05-06 15:49:18 +0200 |
commit | 8849dd8d1a74a46cb761c4d8041e4582d4686724 (patch) | |
tree | 2c917d18ba3292f4713217ec2e5fd523e88ee58e | |
parent | 2b61be32b890e70b1fce45d984327c27302da9bc (diff) | |
download | dracut-8849dd8d1a74a46cb761c4d8041e4582d4686724.tar.gz |
fix: add a missing tmpfilesconfdir global variable
Adding a missing tmpfilesconfdir global variable
-rwxr-xr-x | dracut.sh | 8 | ||||
-rwxr-xr-x | modules.d/01systemd-tmpfiles/module-setup.sh | 1 |
2 files changed, 7 insertions, 2 deletions
@@ -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 2bf97ec2..6c3a37a8 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 \ |