0001-dracut.sh-improve-udevdir.patch 1.2 KB

123456789101112131415161718192021222324252627282930313233343536373839
  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. In commit [9d1b81c dracut.sh: improve udevdir and systemdutildir
  6. fallback logic], it checked a common binary `collect' to localte
  7. udevdir.
  8. But upstream systemd drop binary `collect'.
  9. [https://github.com/systemd/systemd/commit/a168792c2d95695fd30c0371d4b3890a9df1eafb]
  10. So check binary `ata_id' to instead.
  11. Upstream-Status: Submitted [https://github.com/dracutdevs/dracut/pull/558]
  12. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  13. ---
  14. dracut.sh | 4 ++--
  15. 1 file changed, 2 insertions(+), 2 deletions(-)
  16. diff --git a/dracut.sh b/dracut.sh
  17. index 3dc2adc..cc8b01a 100755
  18. --- a/dracut.sh
  19. +++ b/dracut.sh
  20. @@ -1311,8 +1311,8 @@ done
  21. [[ -d $udevdir ]] \
  22. || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)"
  23. if ! [[ -d "$udevdir" ]]; then
  24. - [[ -e /lib/udev/collect ]] && udevdir=/lib/udev
  25. - [[ -e /usr/lib/udev/collect ]] && udevdir=/usr/lib/udev
  26. + [[ -e /lib/udev/ata_id ]] && udevdir=/lib/udev
  27. + [[ -e /usr/lib/udev/ata_id ]] && udevdir=/usr/lib/udev
  28. fi
  29. [[ -d $systemdutildir ]] \
  30. --
  31. 2.7.4