[debian-edu-commits] debian-edu/ 01/01: Fix base-installer.d script to not crash unable to remove /target/debianedufreespace/.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-install.

commit 77bcf61f6403a813fb56079cc0e0a902daf09ac2
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Sep 12 08:43:01 2014 +0200

    Fix base-installer.d script to not crash unable to remove /target/debianedufreespace/.
---
 base-installer   | 7 ++++---
 debian/changelog | 7 +++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/base-installer b/base-installer
index 211349a..966f2b0 100755
--- a/base-installer
+++ b/base-installer
@@ -10,14 +10,15 @@ log() {
 # FIXME check if partman support allocating free space and use this instead
 VG=$(mount | sed -n 's@^/dev/mapper/\(.*\)-root on /target.*@\1 at p')
 if [ -e /dev/$VG/debianedufreespace ] ; then
-    if mount | grep -q /debianedufreespace ; then
+    if grep -q /debianedufreespace /proc/mounts; then
         umount /target/debianedufreespace
     fi
     lvremove -f /dev/$VG/debianedufreespace
     grep -v /debianedufreespace /target/etc/fstab > /target/etc/fstab.new && \
       mv /target/etc/fstab.new /target/etc/fstab
-
-    rmdir /target/debianedufreespace
+    if [ -d /target/debianedufreespace ] ; then
+	rmdir /target/debianedufreespace
+    fi
 fi
 
 # Expand overfull file systems during installation, until /target is umounted.
diff --git a/debian/changelog b/debian/changelog
index 2dfda45..126b06c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debian-edu-install (1.730) UNRELEASED; urgency=low
+
+  * Fix base-installer.d script to not crash unable to remove
+    /target/debianedufreespace/.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Fri, 12 Sep 2014 08:42:54 +0200
+
 debian-edu-install (1.729) unstable; urgency=high
 
   [ Wolfgang Schweer ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-install.git