X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=973165991ede1c2e740ae000bd0e6a0270111faa;hp=aa468748dbac9739b5ed916478b6860e29117c2e;hb=3264c61424d611142919f18593370b3012dc8a44;hpb=2d25ecbf349a8bf1f8d13700807c2a45c13216f3

diff --git a/chroot-script b/chroot-script
index aa46874..9731659 100644
--- a/chroot-script
+++ b/chroot-script
@@ -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.
-# Latest change: Fre Nov 03 17:15:42 CET 2006 [mika]
+# Latest change: Fre Nov 03 21:45:09 CET 2006 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -66,16 +66,25 @@ if [ -n "$TIMEZONE" ] ; then
    ln -sf /usr/share/zoneinfo/$TIMEZONE /etc/localtime
 fi
 
-# set up /etc/fstab if file is UNCONFIGURED
-if grep -q UNCONFIGURED /etc/fstab ; then
+function createfstab(){
    echo "Setting up /etc/fstab"
 cat > /etc/fstab << EOF
 $TARGET      /            auto    defaults,errors=remount-ro 0   1
 sysfs          /sys         sysfs   auto                       0   0
 proc           /proc        proc    defaults                   0   0
-# /dev/sda2    none         swap    sw                         0   0
 /dev/cdrom     /mnt/cdrom0  iso9660 ro,user,noauto             0   0
+# /dev/sda2    none         swap    sw                         0   0
 EOF
+}
+
+# set up /etc/fstab if file is not present (cdebootstrap)
+if [ ! -f /etc/fstab  ] ; then
+   createfstab
+fi
+
+# set up /etc/fstab if file is UNCONFIGURED (debootstrap)
+if grep -q UNCONFIGURED /etc/fstab ; then
+   createfstab
 fi
 
 # create default devices
@@ -113,7 +122,7 @@ if [ -n "$GROOT" ] ; then
    update-grub -y
 
    if [ -z "$MBR" ] ; then
-      echo "Notice: \$MBR not set, not install grub therefore."
+      echo "Notice: \$MBR not set, will not install grub therefor."
    else
       cp /proc/mounts /etc/mtab
       grub-install "$MBR"