Browse Source

fix: add a missing tmpfilesconfdir global variable

Adding a missing tmpfilesconfdir global variable
master
Jóhann B. Guðmundsson 3 years ago committed by Harald Hoyer
parent
commit
8849dd8d1a
  1. 8
      dracut.sh
  2. 1
      modules.d/01systemd-tmpfiles/module-setup.sh

8
dracut.sh

@ -1768,6 +1768,11 @@ if ! [[ -d $dracutsysrootdir$tmpfilesdir ]]; then @@ -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 \ @@ -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.

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

@ -33,7 +33,6 @@ install() { @@ -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 \

Loading…
Cancel
Save