]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
dracut.sh: Fix udevdir detection
authorHongxu Jia <hongxu.jia@windriver.com>
Wed, 3 Apr 2019 07:24:47 +0000 (15:24 +0800)
committerDaniel Molkentin <daniel@molkentin.de>
Fri, 19 Jul 2019 09:01:32 +0000 (11:01 +0200)
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
[https://github.com/systemd/systemd/commit/a168792c2d95695fd30c0371d4b3890a9df1eafb]

So check binary `ata_id' to instead.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
dracut.sh

index 9098571d244e166e11eb4560740c1bff2e6f61c4..fd9903b6637f7bea13079ee81826500972ee1032 100755 (executable)
--- a/dracut.sh
+++ b/dracut.sh
@@ -1311,8 +1311,8 @@ done
 [[ -d $udevdir ]] \
     || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)"
 if ! [[ -d "$udevdir" ]]; then
-    [[ -e /lib/udev/collect ]] && udevdir=/lib/udev
-    [[ -e /usr/lib/udev/collect ]] && udevdir=/usr/lib/udev
+    [[ -e /lib/udev/ata_id ]] && udevdir=/lib/udev
+    [[ -e /usr/lib/udev/ata_id ]] && udevdir=/usr/lib/udev
 fi
 
 [[ -d $systemdutildir ]] \