From: Amadeusz Żołnowski <aidecoe@aidecoe.name>
Date: Wed, 18 Aug 2010 15:31:03 +0000 (+0200)
Subject: 60xen: use 'hash' instead of 'type'
X-Git-Tag: 008~151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ad309fbc60cb7636bbbfc918fc0834d99596f99;p=thirdparty%2Fdracut.git

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

diff --git a/modules.d/60xen/check b/modules.d/60xen/check
index 49d543521..6b9cabe57 100755
--- 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 22f53293d..6ae0060f3 100755
--- 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"
-