do not support lilo but just grub

[grml-debootstrap.git] / grml-debootstrap

diff --git a/grml-debootstrap b/grml-debootstrap
index dd16b4c..f680fd1 100644 (file)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.

-# Latest change: Fre Nov 03 11:15:56 CET 2006 [mika]
+# Latest change: Fre Nov 03 13:50:30 CET 2006 [mika]

 ################################################################################
 # http://www.debian.org/releases/stable/i386/apcs04.html.en
 
 ################################################################################
 # http://www.debian.org/releases/stable/i386/apcs04.html.en
 


@@ -35,9 +35,13 @@ $MKFS $TARGET
 eend $?
 
 # now mount the new partition
 eend $?
 
 # now mount the new partition

-einfo "Mounting $TARGET to $MNTPOINT"
-mount -o rw,suid,dev $TARGET $MNTPOINT
-eend $?
+if grep -q $TARGET /proc/mounts ; then
+   eerror "$TARGEt already mounted, exiting."
+else
+  einfo "Mounting $TARGET to $MNTPOINT"
+  mount -o rw,suid,dev $TARGET $MNTPOINT
+  eend $?
+fi

 
 # get main packages from a debian-mirror
 einfo "Running $DEBOOTSTRAP for release $RELEASE using mirror $MIRROR"
 
 # get main packages from a debian-mirror
 einfo "Running $DEBOOTSTRAP for release $RELEASE using mirror $MIRROR"


@@ -59,7 +63,7 @@ einfo "Preparing chroot system"
   [ -d /etc/debootstrap/share ] && cp -a /etc/debootstrap/share/* $MNTPOINT/share/
   [ -d /etc/debootstrap/usr   ] && cp -a /etc/debootstrap/usr/*   $MNTPOINT/usr/
   [ -d /etc/debootstrap/var   ] && cp -a /etc/debootstrap/var/*   $MNTPOINT/var/
   [ -d /etc/debootstrap/share ] && cp -a /etc/debootstrap/share/* $MNTPOINT/share/
   [ -d /etc/debootstrap/usr   ] && cp -a /etc/debootstrap/usr/*   $MNTPOINT/usr/
   [ -d /etc/debootstrap/var   ] && cp -a /etc/debootstrap/var/*   $MNTPOINT/var/

-eend $?
+eend 0

 
 einfo "Executing chroot-script now"
 chroot $MNTPOINT /bin/chroot-script
 
 einfo "Executing chroot-script now"
 chroot $MNTPOINT /bin/chroot-script