martin f. krafft: Call MAKEDEV to create device nodes only if MAKEDEV is installed

[Martin F. Krafft]

Module: mdadm
Branch: master
Commit: f26b4591bdcdc30dc9ac5bbb1a2040ab319624db
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=f26b4591bdcdc30dc9ac5bbb1a2040ab319624db

Author: martin f. krafft <madduck at debian.org>
Date:   Wed May 26 09:42:39 2010 +0200

Call MAKEDEV to create device nodes only if MAKEDEV is installed

Debian-bug: #569360
Signed-off-by: martin f. krafft <madduck at debian.org>

---

 debian/changelog      |    2 ++
 debian/mdadm.postinst |    6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dc84e1a..b0bf7e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ mdadm (3.1.2-1) UNRELEASED; urgency=low
     fail (closes: #580825). This is related to a recent change in behaviour in
     cron 3.0pl1-110 (see e.g. #581612). Thanks to everyone for their
     suggestions!
+  * Call MAKEDEV to create device nodes only if MAKEDEV is installed
+    (closes: #569360).
 
  -- martin f. krafft <madduck at debian.org>  Wed, 27 Jan 2010 14:42:16 +1300
 
diff --git a/debian/mdadm.postinst b/debian/mdadm.postinst
index 63a4179..56d3cb3 100644
--- a/debian/mdadm.postinst
+++ b/debian/mdadm.postinst
@@ -18,13 +18,15 @@ case "${1:-}" in
       echo 'W: mdadm: failed to load MD subsystem.' >&2
     fi
 
+    MAKEDEV=/dev/MAKEDEV
     if [ ! -e /dev/md15 ] \
       && [ ! -e /dev/.static/dev/md15 ] \
-      && [ ! -e /dev/.devfsd ]; then
+      && [ ! -e /dev/.devfsd ] \
+      && [ -x $MAKEDEV ]; then
 
         echo -n 'Generating array device nodes... ' >&2
         cd /dev
-        if /dev/MAKEDEV md >&2 >/dev/null; then
+        if $MAKEDEV md >&2 >/dev/null; then
           echo 'done.' >&2
         else
           echo 'failed.' >&2