fix(dracut): sysctl global variables

diff --git a/dracut.conf.d/fedora.conf.example b/dracut.conf.d/fedora.conf.example
index 96ef5899d9f5a8e0a512dbe3153c2ec7e5f85bcd..5fc1bfce5e2233e0e72f8e77e5148c3b87304f60 100644 (file)
--- a/dracut.conf.d/fedora.conf.example
+++ b/dracut.conf.d/fedora.conf.example
@@ -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

diff --git a/dracut.sh b/dracut.sh
index 0fdcbc4b1df6802fb47d3b3a905b7dac67bed006..577b7fa1f17e05d52d76fd5bb88884008f8ae8d5 100755 (executable)
--- a/dracut.sh
+++ b/dracut.sh
@@ -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)