kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dracut.sh: Fix udevdir detection 

In commit [9d1b81c dracut.sh: improve udevdir and systemdutildir
fallback logic] , it checked a common binary `collect' to location
udevdir.

But upstream systemd drop binary `collect' since systemd v240
[a168792c2d]

So check binary `ata_id' to instead.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
master
Hongxu Jia 2019-04-03 15:24:47 +08:00 committed by Daniel Molkentin
parent d10f6f8367
commit dddcb80945
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dracut.sh
View File

@ -1311,8 +1311,8 @@ done
[[ -d $udevdir ]] \ [[ -d $udevdir ]] \
|| udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)" || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)"
if ! [[ -d "$udevdir" ]]; then if ! [[ -d "$udevdir" ]]; then
[[ -e /lib/udev/collect ]] && udevdir=/lib/udev [[ -e /lib/udev/ata_id ]] && udevdir=/lib/udev
[[ -e /usr/lib/udev/collect ]] && udevdir=/usr/lib/udev [[ -e /usr/lib/udev/ata_id ]] && udevdir=/usr/lib/udev
fi fi


[[ -d $systemdutildir ]] \ [[ -d $systemdutildir ]] \