On Wed, Sep 15, 2010 at 08:17:40PM +0200, Julien Cristau wrote: > On Tue, Sep 14, 2010 at 21:08:59 +0200, Iustin Pop wrote: > > > On Sun, Sep 12, 2010 at 08:54:01PM +0200, Iustin Pop wrote: > > > Hi, > > > > > > I'd like to upload version 0.9-2 which fixes #596009 and a > > > so-far-unreported bug. The ganeti-instance-debootstrap package contains > > > an OS definition for the Ganeti virtualization manager. > > > […] > > > > Kind and hopefully non-intrusive ping? > > > Please upload.
Thanks. As expected, after uploading, and after pushing the changes to
our git repo, and watching the commit emails, I saw a minor issue. So I
uploaded 0.9-3, with this interdiff:
diff -Nru ganeti-instance-debootstrap-0.9/debian/changelog
ganeti-instance-debootstrap-0.9/debian/changelog
--- ganeti-instance-debootstrap-0.9/debian/changelog 2010-09-12
20:36:27.000000000 +0200
+++ ganeti-instance-debootstrap-0.9/debian/changelog 2010-09-15
22:27:01.000000000 +0200
@@ -1,3 +1,9 @@
+ganeti-instance-debootstrap (0.9-3) unstable; urgency=low
+
+ * Fix the mountpoint check in the recently-added hooks
+
+ -- Iustin Pop <ius...@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 -Nru ganeti-instance-debootstrap-0.9/debian/hooks/clear-root-password
ganeti-instance-debootstrap-0.9/debian/hooks/clear-root-password
--- ganeti-instance-debootstrap-0.9/debian/hooks/clear-root-password
2010-09-12 20:36:27.000000000 +0200
+++ ganeti-instance-debootstrap-0.9/debian/hooks/clear-root-password
2010-09-15 22:27:01.000000000 +0200
@@ -8,7 +8,7 @@
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 -Nru ganeti-instance-debootstrap-0.9/debian/hooks/xen-hvc0
ganeti-instance-debootstrap-0.9/debian/hooks/xen-hvc0
--- ganeti-instance-debootstrap-0.9/debian/hooks/xen-hvc0 2010-09-12
20:36:27.000000000 +0200
+++ ganeti-instance-debootstrap-0.9/debian/hooks/xen-hvc0 2010-09-15
22:27:01.000000000 +0200
@@ -8,7 +8,7 @@
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
The changes is adding -d to mountpoint, as the intention is that we
don't operate on the root filesystem.
I understand if you don't unblock this, it's entirely my fault.
regards,
iustin
signature.asc
Description: Digital signature
