From 3ca9aa1d7b24b82e01d16613b86ec3be97c8a1bb Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= Date: Tue, 20 Apr 2021 05:46:50 +0000 Subject: [PATCH] fix(dracut): sysctl global variables --- dracut.conf.d/fedora.conf.example | 2 +- dracut.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dracut.conf.d/fedora.conf.example b/dracut.conf.d/fedora.conf.example index 96ef5899d..5fc1bfce5 100644 --- 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 0fdcbc4b1..577b7fa1f 100755 --- 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) -- 2.39.2