60xen: use 'hash' instead of 'type'

diff --git a/modules.d/60xen/check b/modules.d/60xen/check
index 49d54352110211e2d01c5b45e6f2f4bc7c1d7015..6b9cabe5734cc31020f2ae6d95c6fa38b7665f5f 100755 (executable)
--- a/modules.d/60xen/check
+++ b/modules.d/60xen/check
@@ -1,14 +1,15 @@
 #!/bin/bash
 
 # No Xen-detect? Boo!!
-XENDETECT=$(type -P xen-detect)
-[ -z "$XENDETECT" ] && [ -d "/usr/lib/xen-default" ] && XENDETECT="/usr/lib/xen-default/bin/xen-detect"
-[ -z "$XENDETECT" ] && exit 1
+if ! hash xen-detect 2>/dev/null; then
+    [[ -d /usr/lib/xen-default ]] && \
+        hash -p /usr/lib/xen-default/bin/xen-detect xen-detect || exit 1
+fi
 
 . $dracutfunctions
 [[ $debug ]] && set -x
 
 # Yes, we are under Xen PV env.
-$XENDETECT | egrep -q -v 'PV' || exit 0
+xen-detect | grep -q -v PV || exit 0
 
 exit 1

diff --git a/modules.d/60xen/install b/modules.d/60xen/install
index 22f53293d4e2740782b3c4cc6bd6370e802e0427..6ae0060f35bf4696de555df5f410caafb2f55b03 100755 (executable)
--- a/modules.d/60xen/install
+++ b/modules.d/60xen/install
@@ -1,6 +1,5 @@
 #!/bin/bash
-XENDETECT=$(type -P xen-detect)
-[ -z "$XENDETECT" ] && [ -d "/usr/lib/xen-default" ] && XENDETECT="/usr/lib/xen-default/bin/xen-detect"
-inst $XENDETECT /sbin/xen-detect
+hash xen-detect 2>/dev/null || \
+    hash -p /usr/lib/xen-default/bin/xen-detect xen-detect
+inst "$(hash -t xen-detect)" /sbin/xen-detect
 inst_hook pre-udev 40 "$moddir/xen-pre-udev.sh"
-