Skip to content

Commit 8849dd8

Browse files
johannbgharaldh
authored andcommitted
fix: add a missing tmpfilesconfdir global variable
Adding a missing tmpfilesconfdir global variable
1 parent 2b61be3 commit 8849dd8

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

dracut.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -1768,6 +1768,11 @@ if ! [[ -d $dracutsysrootdir$tmpfilesdir ]]; then
17681768
[[ -d $dracutsysrootdir/usr/lib/tmpfiles.d ]] && tmpfilesdir=/usr/lib/tmpfiles.d
17691769
fi
17701770
1771+
[[ -d $dracutsysrootdir$tmpfilesconfdir ]] \
1772+
|| tmpfilesconfdir=$(pkg-config systemd --variable=tmpfilesconfdir 2> /dev/null)
1773+
1774+
[[ -d $dracutsysrootdir$tmpfilesconfdir ]] || tmpfilesconfdir=/etc/tmpfiles.d
1775+
17711776
[[ -d $dracutsysrootdir$depmodd ]] \
17721777
|| sysctld=$(pkg-config libkmod --variable=depmodd 2> /dev/null)
17731778
@@ -1794,7 +1799,8 @@ export initdir dracutbasedir \
17941799
modulesloadconfdir sysctl sysctlconfdir sysusers sysusersconfdir \
17951800
systemdutildir systemdutilconfdir systemdcatalog systemdntpunits \
17961801
systemdntpunitsconfdir systemdsystemunitdir systemdsystemconfdir \
1797-
hostonly_cmdline loginstall tmpfilesdir depmodd depmodconfdir
1802+
hostonly_cmdline loginstall tmpfilesdir tmpfilesconfdir depmodd \
1803+
depmodconfdir
17981804
17991805
mods_to_load=""
18001806
# check all our modules to see if they should be sourced.

modules.d/01systemd-tmpfiles/module-setup.sh

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ install() {
3333
# Excluding "$tmpfilesdir/systemd-pstore.conf", belongs in seperated pstore module
3434
# Excluding "$tmpfilesdir/x11.conf", belongs in seperated x11 module
3535

36-
3736
inst_multiple -o \
3837
/usr/lib/group \
3938
/usr/lib/passwd \

0 commit comments

Comments
 (0)