From 610ba4e71dffeee7bb0e26b4f364d7eb71438c39 Mon Sep 17 00:00:00 2001
From: Axel Beckert <abe@deuxchevaux.org>
Date: Tue, 26 Jan 2010 02:25:03 +0100
Subject: [PATCH] Make sure, MAKEDEV is found (Closes: #502798)

---
 debian/changelog           |  4 +++-
 hooks/debian/55-create-dev | 21 +++++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4c9c1bd..3257e63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,9 @@ xen-tools (4.2-1) UNRELEASED; urgency=low
     bash-completion ships a more elaborate version of that file. (Closes:
     #566683, #550590)
   * Set umask to 0077 before creating disk images (Closes: #548909)
-  
+  * Make sure, MAKEDEV is found in either /dev/ or /sbin/ (Closes:
+    #502798)
+
  --
 
 xen-tools (4.1-1) unstable; urgency=low
diff --git a/hooks/debian/55-create-dev b/hooks/debian/55-create-dev
index 2908a94..d6a33e7 100755
--- a/hooks/debian/55-create-dev
+++ b/hooks/debian/55-create-dev
@@ -26,6 +26,15 @@ fi
 #
 logMessage Script $0 starting
 
+#
+# Test where MAKEDEV is located, assuming /sbin/ as default
+#
+my $MAKEDEV = "$prefix/sbin/MAKEDEV";
+if ( !-x $MAKEDEV and -x "$prefix/dev/MAKEDEV" ) {
+    $MAKEDEV = "$prefix/dev/MAKEDEV";
+}
+	
+
 
 #
 # Early termination if we have a couple of common devices present
@@ -36,10 +45,10 @@ if ( test `ls -1 ${prefix}/dev | wc -l` -gt 10 ); then
     # We still need to make sure the basic devices are present
     #
     cd ${prefix}/dev
-    ./MAKEDEV std
-    ./MAKEDEV hda
-    ./MAKEDEV sda
-    ./MAKEDEV tty1
+    $MAKEDEV std
+    $MAKEDEV hda
+    $MAKEDEV sda
+    $MAKEDEV tty1
 
     logMessage "Terminating because there appear to be files in /dev already"
     exit
@@ -50,8 +59,8 @@ fi
 #  Make the device nodes.
 #
 cd ${prefix}/dev
-./MAKEDEV generic
-./MAKEDEV std
+$MAKEDEV generic
+$MAKEDEV std
 
 
 #