| Brad Bishop | 34ae600 | 2019-04-08 15:21:03 -0400 | [diff] [blame^] | 1 | From 974f728410052bc8fa18d93dc0c1a991bcdb96e6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Wed, 3 Apr 2019 15:24:47 +0800 |
| 4 | Subject: [PATCH] dracut.sh: improve udevdir |
| 5 | |
| 6 | In commit [9d1b81c dracut.sh: improve udevdir and systemdutildir |
| 7 | fallback logic], it checked a common binary `collect' to localte |
| 8 | udevdir. |
| 9 | |
| 10 | But upstream systemd drop binary `collect'. |
| 11 | [https://github.com/systemd/systemd/commit/a168792c2d95695fd30c0371d4b3890a9df1eafb] |
| 12 | |
| 13 | So check binary `ata_id' to instead. |
| 14 | |
| 15 | Upstream-Status: Submitted [https://github.com/dracutdevs/dracut/pull/558] |
| 16 | |
| 17 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 18 | --- |
| 19 | dracut.sh | 4 ++-- |
| 20 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 21 | |
| 22 | diff --git a/dracut.sh b/dracut.sh |
| 23 | index 3dc2adc..cc8b01a 100755 |
| 24 | --- a/dracut.sh |
| 25 | +++ b/dracut.sh |
| 26 | @@ -1311,8 +1311,8 @@ done |
| 27 | [[ -d $udevdir ]] \ |
| 28 | || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)" |
| 29 | if ! [[ -d "$udevdir" ]]; then |
| 30 | - [[ -e /lib/udev/collect ]] && udevdir=/lib/udev |
| 31 | - [[ -e /usr/lib/udev/collect ]] && udevdir=/usr/lib/udev |
| 32 | + [[ -e /lib/udev/ata_id ]] && udevdir=/lib/udev |
| 33 | + [[ -e /usr/lib/udev/ata_id ]] && udevdir=/usr/lib/udev |
| 34 | fi |
| 35 | |
| 36 | [[ -d $systemdutildir ]] \ |
| 37 | -- |
| 38 | 2.7.4 |
| 39 | |