some code updates for cdebootstrap

diff --git a/TODO b/TODO
index 45699d2..c9e88be 100644 (file)
--- a/TODO
+++ b/TODO
@@ -3,6 +3,8 @@ TODO list for grml-debootstrap
 
 * support tarballs for customization
 * support automatic installation of grml core packages
+* support bootoption debian2hd for installation through bootoption
+* support *full* automatic installation where not a single keypress is necessary
 
 Test matrix
 -----------

diff --git a/chroot-script b/chroot-script
index 0fcaa58..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 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

diff --git a/grml-debootstrap b/grml-debootstrap
index 024c33f..98e0e0e 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.
-# Latest change: Fre Nov 03 18:05:56 CET 2006 [mika]
+# Latest change: Fre Nov 03 21:35:09 CET 2006 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/apcs04.html.en
 
@@ -101,6 +101,9 @@ einfo "Preparing chroot system"
   cp /etc/debootstrap/config $MNTPOINT/etc/debootstrap/
   cp /etc/debootstrap/packages $MNTPOINT/etc/debootstrap/packages
 
+  # make sure we can access network [relevant for cdebootstrap]
+  [ -f "$MNTPOINT/etc/resolv.conf" ] || cp /etc/resolv.conf $MNTPOINT/etc/resolv.conf
+
   # copy any existing existing files to chroot
   [ -d /etc/debootstrap/boot  ] && cp -a /etc/debootstrap/boot/*  $MNTPOINT/boot/
   [ -d /etc/debootstrap/etc   ] && cp -a /etc/debootstrap/etc/*   $MNTPOINT/etc/
@@ -113,6 +116,10 @@ einfo "Executing chroot-script now"
 chroot $MNTPOINT /bin/chroot-script
 eend $?
 
+# einfo "Removing chroot-script"
+# rm -f $MNTPOINT/bin/chroot-script
+# eend $?
+
 einfo "Unmount $MNTPOINT"
 umount $MNTPOINT
 eend $?