some code updates for cdebootstrap

[grml-debootstrap.git] / chroot-script

diff --git a/chroot-script b/chroot-script
index 1ce5ac7..9731659 100644 (file)
--- 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 15:14:28 CET 2006 [mika]
+# Latest change: Fre Nov 03 21:45:09 CET 2006 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -17,6 +17,10 @@ if [ -n "$CHROOTMIRROR" ] ; then
    echo "$CHROOTMIRROR" > /etc/apt/sources.list
 fi
 
+# if ! [ -n /etc/kernel-img.conf ] ; then
+#   echo "do_initrd = Yes" > /etc/kernel-img.conf
+# fi
+
 # install additional packages
 if [ "$PACKAGES" = 'yes' ] ; then
    if ! [ -r /etc/debootstrap/packages ] ; then
@@ -62,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
@@ -108,6 +121,13 @@ if [ -n "$GROOT" ] ; then
    sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst
    update-grub -y
 
+   if [ -z "$MBR" ] ; then
+      echo "Notice: \$MBR not set, will not install grub therefor."
+   else
+      cp /proc/mounts /etc/mtab
+      grub-install "$MBR"
+      rm /etc/mtab
+   fi
 fi
 
 # unmount all filesystems in chroot, make sure nothing is left...