Update documentation and config file

diff --git a/config b/config
index 9073747..bf05956 100644 (file)
--- a/config
+++ b/config
@@ -3,7 +3,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: Mon Apr 16 18:45:19 CEST 2007 [mika]
+# Latest change: Die Jun 05 14:00:07 CEST 2007 [mika]

 ################################################################################
 
 ################################################################################
 ################################################################################
 
 ################################################################################


@@ -54,6 +54,11 @@ MIRROR='ftp://ftp.debian.de/debian'
 # if empty then existing /etc/apt/sources.list will be taken
 CHROOTMIRROR='ftp://ftp.debian.de/debian'
 
 # if empty then existing /etc/apt/sources.list will be taken
 CHROOTMIRROR='ftp://ftp.debian.de/debian'
 

+# specify directory of loopback mounted Debian-ISO so you don't
+# have to download all the core packages via network but can
+# use an available Debian-ISO instead
+# ISO='file:/mnt/iso/debian/'
+

 # add grml repository to /etc/apt/sources.list
 # if empty then the repository won't be added (notice: in testing phase)
 # GRMLREPOS='yes'
 # add grml repository to /etc/apt/sources.list
 # if empty then the repository won't be added (notice: in testing phase)
 # GRMLREPOS='yes'

diff --git a/grml-debootstrap b/grml-debootstrap
index 68d8824..2a36d4e 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -178,6 +178,7 @@ chmod 600 /etc/debootstrap/variables # make sure nobody except root can read it
 [ -n "$GROOT" ]  && echo "GROOT=$GROOT"   >> /etc/debootstrap/variables
 [ -n "$TARGET" ] && echo "TARGET=$TARGET" >> /etc/debootstrap/variables
 [ -n "$ISO" ]    && echo "ISO=$ISO"       >> /etc/debootstrap/variables
 [ -n "$GROOT" ]  && echo "GROOT=$GROOT"   >> /etc/debootstrap/variables
 [ -n "$TARGET" ] && echo "TARGET=$TARGET" >> /etc/debootstrap/variables
 [ -n "$ISO" ]    && echo "ISO=$ISO"       >> /etc/debootstrap/variables

+[ -n "$ISODIR" ] && echo "ISODIR=$ISO"    >> /etc/debootstrap/variables

 [ -n "$MIRROR" ] && echo "MIRROR=$MIRROR" >> /etc/debootstrap/variables
 [ -n "$MIRROR" ] && echo "CHROOTMIRROR=$MIRROR" >> /etc/debootstrap/variables
 [ -n "$ROOTPASSWORD" ] && echo "ROOTPASSWORD=$ROOTPASSWORD" >> /etc/debootstrap/variables
 [ -n "$MIRROR" ] && echo "MIRROR=$MIRROR" >> /etc/debootstrap/variables
 [ -n "$MIRROR" ] && echo "CHROOTMIRROR=$MIRROR" >> /etc/debootstrap/variables
 [ -n "$ROOTPASSWORD" ] && echo "ROOTPASSWORD=$ROOTPASSWORD" >> /etc/debootstrap/variables


@@ -298,8 +299,10 @@ mount_target() {
      fi
   fi
   if [ -n "$ISODIR" ] ; then
      fi
   fi
   if [ -n "$ISODIR" ] ; then

+     einfo "Mounting Debian image loopback to $MNTPOINT/$ISODIR."

      mkdir -p "$MNTPOINT/$ISODIR"
      mount --bind "$ISODIR" "$MNTPOINT/$ISODIR"
      mkdir -p "$MNTPOINT/$ISODIR"
      mount --bind "$ISODIR" "$MNTPOINT/$ISODIR"

+     eend $?

   fi
 }
 # }}}
   fi
 }
 # }}}

diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt
index 0644643..6bd3b9c 100644 (file)
--- a/grml-debootstrap.8.txt
+++ b/grml-debootstrap.8.txt
@@ -55,6 +55,13 @@ Options and environment variables
     specifying the mirror also sets the chrootmirror to the given value.
     Corresponding with configuration variables MIRROR and CHROOTMIRROR.
 
     specifying the mirror also sets the chrootmirror to the given value.
     Corresponding with configuration variables MIRROR and CHROOTMIRROR.
 

+*-i*, *--iso* <_/mntpoint_>::
+    Specify mountpoint where you have a Debian ISO mounted loopback.
+    Using this option instead of the mirror option gives you the possibility
+    to install the base-system without network access. Make sure you
+    mounted the according Debian-ISO to the given mntpoint. See section
+    'Usage examples' for a demonstration.
+

 *-p*, *--mntpoint* <_/mntpoint_>::
     Specify mountpoint that should be used for mounting the target system.
     Corresponding with configuration variable MNTPOINT.
 *-p*, *--mntpoint* <_/mntpoint_>::
     Specify mountpoint that should be used for mounting the target system.
     Corresponding with configuration variable MNTPOINT.


@@ -100,6 +107,15 @@ Install default Debian release (stable/etch) on /dev/sda3 and install bootmanage
 Grub in MBR (master boot record) of /dev/sda and use /dev/sda3 as system partition.
 Use specifed mirror instead of the default (ftp://ftp.debian.de/debian) one.
 
 Grub in MBR (master boot record) of /dev/sda and use /dev/sda3 as system partition.
 Use specifed mirror instead of the default (ftp://ftp.debian.de/debian) one.
 

+  mount -o loop /mnt/hda6/debian-40r0-i386-CD-1.iso /mnt/iso
+  grml-debootstrap --target /dev/hda1 --grub hd0 --groot hd0,0 --iso file:/mnt/iso/debian/
+
+Install Debian stable/etch on /dev/hda1 using the loopback mounted Debian-ISO
+for the base-system and install bootmanager Grub in MBR (master boot record) of
+/dev/hda and use /dev/hda1 as system partition. Please notice, that the chroot
+system requires network access for all packages which are not part of the
+ISO.
+

 Files
 -----
 
 Files
 -----