Skip to content

Commit b9dc999

Browse files
aafeijoo-susejohannbg
authored andcommitted
fix(dracut.sh): correct wrong systemd variable paths
systemdsystemconfdir usually expands to /etc/systemd/system, but the local configuration of systemd-networkd, systemd-timesyncd, portablectl and systemd users is saved into directories whose parent is /etc/systemd (systemdutilconfdir). Also add missing exports.
1 parent 027eee9 commit b9dc999

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

dracut.sh

+8-6
Original file line numberDiff line numberDiff line change
@@ -1833,7 +1833,7 @@ fi
18331833
[[ -d $dracutsysrootdir$systemdnetworkconfdir ]] \
18341834
|| systemdnetworkconfdir=$(pkg-config systemd --variable=systemdnetworkconfdir 2> /dev/null)
18351835
1836-
[[ -d $dracutsysrootdir$systemdnetworkconfdir ]] || systemdnetworkconfdir=${systemdsystemconfdir}/network
1836+
[[ -d $dracutsysrootdir$systemdnetworkconfdir ]] || systemdnetworkconfdir=${systemdutilconfdir}/network
18371837
18381838
[[ -d $dracutsysrootdir$systemdntpunits ]] \
18391839
|| systemdntpunits=$(pkg-config systemd --variable=systemdntpunits 2> /dev/null)
@@ -1843,7 +1843,7 @@ fi
18431843
[[ -d $dracutsysrootdir$systemdntpunitsconfdir ]] \
18441844
|| systemdntpunitsconfdir=$(pkg-config systemd --variable=systemdntpunitsconfdir 2> /dev/null)
18451845
1846-
[[ -d $dracutsysrootdir$systemdntpunitsconfdir ]] || systemdntpunitsconfdir=${systemdsystemconfdir}/ntp-units.d
1846+
[[ -d $dracutsysrootdir$systemdntpunitsconfdir ]] || systemdntpunitsconfdir=${systemdutilconfdir}/ntp-units.d
18471847
18481848
[[ -d $dracutsysrootdir$systemdportable ]] \
18491849
|| systemdportable=$(pkg-config systemd --variable=systemdportable 2> /dev/null)
@@ -1853,7 +1853,7 @@ fi
18531853
[[ -d $dracutsysrootdir$systemdportableconfdir ]] \
18541854
|| systemdportableconfdir=$(pkg-config systemd --variable=systemdportableconfdir 2> /dev/null)
18551855
1856-
[[ -d "$dracutsysrootdir$systemdportableconfdir" ]] || systemdportableconfdir=${systemdsystemconfdir}/portable
1856+
[[ -d "$dracutsysrootdir$systemdportableconfdir" ]] || systemdportableconfdir=${systemdutilconfdir}/portable
18571857
18581858
[[ -d $dracutsysrootdir$systemdsystemunitdir ]] \
18591859
|| systemdsystemunitdir=$(pkg-config systemd --variable=systemdsystemunitdir 2> /dev/null)
@@ -1868,7 +1868,7 @@ fi
18681868
[[ -d $dracutsysrootdir$systemduserconfdir ]] \
18691869
|| systemduserconfdir=$(pkg-config systemd --variable=systemduserconfdir 2> /dev/null)
18701870
1871-
[[ -d $dracutsysrootdir$systemduserconfdir ]] || systemduserconfdir=${systemdsystemconfdir}/user
1871+
[[ -d $dracutsysrootdir$systemduserconfdir ]] || systemduserconfdir=${systemdutilconfdir}/user
18721872
18731873
[[ -d $dracutsysrootdir$systemdsystemconfdir ]] \
18741874
|| systemdsystemconfdir=$(pkg-config systemd --variable=systemdsystemconfdir 2> /dev/null)
@@ -1922,8 +1922,10 @@ export initdir dracutbasedir \
19221922
dbussessionconfdir dbussystem dbussystemconfdir dbussystemservices \
19231923
dbussystemservicesconfdir environment environmentconfdir modulesload \
19241924
modulesloadconfdir sysctld sysctlconfdir sysusers sysusersconfdir \
1925-
systemdutildir systemdutilconfdir systemdcatalog systemdntpunits \
1926-
systemdntpunitsconfdir systemdsystemunitdir systemdsystemconfdir \
1925+
systemdutildir systemdutilconfdir systemdcatalog systemdnetwork \
1926+
systemdnetworkconfdir systemdntpunits systemdntpunitsconfdir \
1927+
systemdportable systemdportableconfdir systemdsystemunitdir \
1928+
systemdsystemconfdir systemduser systemduserconfdir \
19271929
hostonly_cmdline loginstall tmpfilesdir tmpfilesconfdir depmodd \
19281930
depmodconfdir
19291931

0 commit comments

Comments
 (0)