[Pkg-ganeti-devel] [SCM] Instance debootstrap packaging branch, master, updated. debian/0.9-2-1-g95a6127

[Iustin Pop]

The following commit has been merged in the master branch:
commit 95a6127fec3072484882da4de8d57f793540245c
Author: Iustin Pop <iustin at debian.org>
Date:   Wed Sep 15 22:27:01 2010 +0200

    Fix mountpoint hooks (add '-d'), release 0.9-3

diff --git a/debian/changelog b/debian/changelog
index c5a4766..146049f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ganeti-instance-debootstrap (0.9-3) unstable; urgency=low
+
+  * Fix the mountpoint check in the recently-added hooks
+
+ -- Iustin Pop <iustin at debian.org>  Wed, 15 Sep 2010 22:26:24 +0200
+
 ganeti-instance-debootstrap (0.9-2) unstable; urgency=low
 
   * Add a hook for fixing Xen PVM console issues (Closes: #596009)
diff --git a/debian/hooks/clear-root-password b/debian/hooks/clear-root-password
index 2b083cb..417b62d 100755
--- a/debian/hooks/clear-root-password
+++ b/debian/hooks/clear-root-password
@@ -8,7 +8,7 @@ if [ -z "$TARGET" -o "$TARGET" = "/" ]; then
     exit 1
 fi
 
-if [ "$(mountpoint /)" = "$(mountpoint "$TARGET")" ]; then
+if [ "$(mountpoint -d /)" = "$(mountpoint -d "$TARGET")" ]; then
     echo "The target directory seems to be the root dir, aborting."  1>&2
     exit 1
 fi
diff --git a/debian/hooks/xen-hvc0 b/debian/hooks/xen-hvc0
index 416f19d..5210767 100755
--- a/debian/hooks/xen-hvc0
+++ b/debian/hooks/xen-hvc0
@@ -8,7 +8,7 @@ if [ -z "$TARGET" -o "$TARGET" = "/" ]; then
     exit 1
 fi
 
-if [ "$(mountpoint /)" = "$(mountpoint "$TARGET")" ]; then
+if [ "$(mountpoint -d /)" = "$(mountpoint -d "$TARGET")" ]; then
     echo "The target directory seems to be the root dir, aborting."  1>&2
     exit 1
 fi

-- 
Instance debootstrap packaging