fix(dracut): sysctl global variables

master
Jóhann B. Guðmundsson 2021-04-20 05:46:50 +00:00 committed by Harald Hoyer
parent fd15dbad6e
commit 3ca9aa1d7b
2 changed files with 4 additions and 4 deletions

View File

@ -25,7 +25,7 @@ dbussessionconfdir=/etc/dbus-1/session.d
dbussystem=confdir/etc/dbus-1/system.d
dbussystemservicesconfdir=/etc/dbus-1/system-services
sysctld=/usr/lib/sysctl.d
sysctldconfdir=/etc/sysctl.d
sysctlconfdir=/etc/sysctl.d
systemdutildir=/usr/lib/systemd
systemdutilconfdir=/etc/systemd
systemdcatalog=/usr/lib/systemd/catalog

View File

@ -1640,10 +1640,10 @@ if ! [[ -d $dracutsysrootdir$udevdir ]]; then
[[ -e $dracutsysrootdir/usr/lib/udev/ata_id ]] && udevdir=/usr/lib/udev
fi

[[ -d $dracutsysrootdir$sysctl ]] \
|| sysctl=$(pkg-config systemd --variable=sysctl 2> /dev/null)
[[ -d $dracutsysrootdir$sysctld ]] \
|| sysctld=$(pkg-config systemd --variable=sysctld 2> /dev/null)

[[ -d $dracutsysrootdir$sysctl ]] || sysctl=/usr/lib/sysctl.d
[[ -d $dracutsysrootdir$sysctld ]] || sysctld=/usr/lib/sysctl.d

[[ -d $dracutsysrootdir$sysctlconfdir ]] \
|| sysctlconfdir=$(pkg-config systemd --variable=sysctlconfdir 2> /dev/null)