Skip to content

Commit

Permalink
fix(dracut): sysctl global variables
Browse files Browse the repository at this point in the history
  • Loading branch information
johannbg authored and haraldh committed Apr 20, 2021
1 parent fd15dba commit 3ca9aa1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion dracut.conf.d/fedora.conf.example
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions dracut.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 3ca9aa1

Please sign in to comment.