Skip to content

Commit f35d479

Browse files
johannbgharaldh
authored andcommitted
fix(dracut): adding missing globalvars for udev
Adding missing global variables for udev udevconfdir --> /etc/udev udevrulesdir --> /usr/lib/udev/rules.d udevrulesconfdir --> /etc/udev/rules.d
1 parent 3534789 commit f35d479

File tree

1 file changed

+24
-9
lines changed

1 file changed

+24
-9
lines changed

Diff for: dracut.sh

+24-9
Original file line numberDiff line numberDiff line change
@@ -1642,6 +1642,21 @@ if ! [[ -d $dracutsysrootdir$udevdir ]]; then
16421642
[[ -e $dracutsysrootdir/usr/lib/udev/ata_id ]] && udevdir=/usr/lib/udev
16431643
fi
16441644
1645+
[[ -d $dracutsysrootdir$udevconfdir ]] \
1646+
|| udevconfdir=$(pkg-config udev --variable=udevconfdir 2> /dev/null)
1647+
1648+
[[ -d $dracutsysrootdir$udevconfdir ]] || udevconfdir=/etc/udev
1649+
1650+
[[ -d $dracutsysrootdir$udevrulesdir ]] \
1651+
|| udevrulesdir=$(pkg-config udev --variable=udevrulesdir 2> /dev/null)
1652+
1653+
[[ -d $dracutsysrootdir$udevrulesdir ]] || udevrulesdir=${udevdir}/rules.d
1654+
1655+
[[ -d $dracutsysrootdir$udevrulesconfdir ]] \
1656+
|| udevrulesconfdir=$(pkg-config udev --variable=udevrulesconfdir 2> /dev/null)
1657+
1658+
[[ -d $dracutsysrootdir$udevrulesconfdir ]] || udevrulesconfdir=${udevconfdir}/rules.d
1659+
16451660
[[ -d $dracutsysrootdir$sysctld ]] \
16461661
|| sysctld=$(pkg-config systemd --variable=sysctld 2> /dev/null)
16471662
@@ -1753,15 +1768,15 @@ export initdir dracutbasedir \
17531768
use_fstab fstab_lines libdirs fscks nofscks ro_mnt \
17541769
stdloglvl sysloglvl fileloglvl kmsgloglvl logfile \
17551770
debug host_fs_types host_devs swap_devs sshkey add_fstab \
1756-
DRACUT_VERSION udevdir prefix filesystems drivers \
1757-
dbus dbusconfdir dbusinterfaces dbusinterfacesconfdir \
1758-
dbusservices dbusservicesconfdir dbussession dbussessionconfdir \
1759-
dbussystem dbussystemconfdir dbussystemservices dbussystemservicesconfdir \
1760-
environment environmentconfdir modulesload modulesloadconfdir sysctl \
1761-
sysctlconfdir sysusers sysusersconfdir systemdutildir systemdutilconfdir \
1762-
systemdcatalog systemdntpunits systemdntpunitsconfdir systemdsystemunitdir \
1763-
systemdsystemconfdir hostonly_cmdline loginstall \
1764-
tmpfilesdir
1771+
DRACUT_VERSION udevdir udevconfdir udevrulesdir udevrulesconfdir \
1772+
prefix filesystems drivers dbus dbusconfdir dbusinterfaces \
1773+
dbusinterfacesconfdir dbusservices dbusservicesconfdir dbussession \
1774+
dbussessionconfdir dbussystem dbussystemconfdir dbussystemservices \
1775+
dbussystemservicesconfdir environment environmentconfdir modulesload \
1776+
modulesloadconfdir sysctl sysctlconfdir sysusers sysusersconfdir \
1777+
systemdutildir systemdutilconfdir systemdcatalog systemdntpunits \
1778+
systemdntpunitsconfdir systemdsystemunitdir systemdsystemconfdir \
1779+
hostonly_cmdline loginstall tmpfilesdir
17651780
17661781
mods_to_load=""
17671782
# check all our modules to see if they should be sourced.

0 commit comments

Comments
 (0)