X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=d9d3202301319136ea2ee3ff21fe7f20fb8697c6;hp=f1b0afffc471c6640fb1d62fb81c14b0670086af;hb=ba5d59edd575a091daa4bd9b9fb446015ea0fc5a;hpb=828061e11237bba165023196c1def7f361d7cbcf

diff --git a/grml-debootstrap b/grml-debootstrap
index f1b0aff..d9d3202 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -4,13 +4,13 @@
 # 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 20:31:21 CEST 2007 [mika]
+# Latest change: Die Jun 05 14:23:38 CEST 2007 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/index.html.en
 
 set -e # exit on any error
 
-VERSION='0.7'
+VERSION='0.10'
 
 # source core functions {{{
 . /etc/grml/lsb-functions
@@ -41,16 +41,18 @@ usage() {
   echo
   einfo "Valid options:"
   echo  "
-    -h|--help              Print this usage information and exit.
-    -v|--version           Show summary of options and exit.
-
-    -t|--target <target>   Target partition (/dev/...) or directory.
-    -r|--release <release> Specify release of new Debian system. Supported relases: sarge, etch, lenny and sid.
-    -m|--mirror <URL>      Specify mirror which should be used for apt-get/aptitude.
-    -p|--mntpoint <mnt>    Specify mountpoint that should be used for mounting the target system.
-    --groot <device>       Specify root device for usage in grub (corresponds with \$TARGET).
-    --grub <device>        Where do you want to install grub to? Use grub syntax for specifying.
-    --password <pwd>       Use specified password as password for user root. Use with caution.
+    -h|--help                   Print this usage information and exit.
+    -v|--version                Show summary of options and exit.
+
+    -t|--target <target>        Target partition (/dev/...) or directory.
+    -r|--release <release>      Specify release of new Debian system. Supported relases: sarge, etch, lenny and sid.
+    -m|--mirror <URL>           Specify mirror which should be used for apt-get/aptitude.
+    -i|--iso <mnt>              Specify mountpoint where Debian ISO is mounted to (instead of using mirror)
+    -p|--mntpoint <mnt>         Specify mountpoint that should be used for mounting the target system.
+    --groot <device>            Specify root device for usage in grub (corresponds with \$TARGET).
+    --grub <device>             Where do you want to install grub to? Use grub syntax for specifying.
+    --password <pwd>            Use specified password as password for user root. Use with caution.
+    --boot_append <appendline>  Add specified appendline to kernel whilst booting
 
 "
 }
@@ -92,6 +94,11 @@ while [ "$#" -gt "0" ] ; do
             MIRROR=$1
             CHROOTMIRROR=$1
             ;;
+        -i|--iso)
+            shift
+            [ -n "$MIRROR" ] && unset MIRROR
+            ISO=$1
+            ;;
         -h|--help)
             usage ; eend 0
             eend 0
@@ -153,6 +160,17 @@ else
    ARCHINFO=" (${ARCH})"
 fi
 
+# make sure we have the right syntax when using an iso image
+case $ISO in
+   file*) # do nothing
+    ;;
+   *)
+    ISO=file:$1
+    ;;
+esac
+ISODIR=${ISO##file:}
+ISODIR=${ISODIR%%/}
+
 # provide variables to chroot system
 touch /etc/debootstrap/variables
 chmod 600 /etc/debootstrap/variables # make sure nobody except root can read it
@@ -160,6 +178,8 @@ chmod 600 /etc/debootstrap/variables # make sure nobody except root can read it
 [ -n "$GRUB" ]   && echo "GRUB=$GRUB"     >> /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
@@ -185,6 +205,7 @@ bailout(){
         [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount -a    1>/dev/null 2>&1
         [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount /proc 1>/dev/null 2>&1
         [ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount /proc 1>/dev/null 2>&1
+        [ -d "$MNTPOINT/$ISODIR" ] && umount "$MNTPOINT/$ISODIR" 1>/dev/null 2>&1
         einfo "Unmounting $MNTPOINT" ; umount "$MNTPOINT" ; eend $?
      fi
   fi
@@ -226,12 +247,13 @@ if [ -n "$AUTOINSTALL" ] ; then
    fi
 else # if not running automatic installation display configuration and prompt for execution:
    einfo "$0 - Please recheck configuration before execution:"
-   echo "
-      Target:           $TARGET"
+   echo
+   echo "   Target:           $TARGET"
       case "$MNTPOINT" in "$TARGET") ;; *) echo "   Mount-point:      $MNTPOINT" ;; esac
       [ -n "$GRUB" ]   && echo "   Install grub to:  $GROOT / $GRUB"
       [ -n "$MIRROR" ] && echo "   Using mirror:     $MIRROR"
-      case "$MNTPOINT" in "$TARGET") ;; *) echo "  Important! Continuing will delete all data from ${TARGET}!" ;; esac
+      [ -n "$ISO" ] && echo "   Using iso:        $ISO"
+      case "$MNTPOINT" in "$TARGET") ;; *) echo "   Important! Continuing will delete all data from ${TARGET}!" ;; esac
       echo
    einfon "Is this ok for you? [y/N] "
    read a
@@ -277,6 +299,12 @@ mount_target() {
        eend $?
      fi
   fi
+  if [ -n "$ISODIR" ] ; then
+     einfo "Mounting Debian image loopback to $MNTPOINT/$ISODIR."
+     mkdir -p "$MNTPOINT/$ISODIR"
+     mount --bind "$ISODIR" "$MNTPOINT/$ISODIR"
+     eend $?
+  fi
 }
 # }}}
 
@@ -286,8 +314,9 @@ debootstrap_system() {
           mount_target
   fi
   if grep -q $MNTPOINT /proc/mounts ; then
-     einfo "Running $DEBOOTSTRAP for release ${RELEASE}${ARCHINFO} using mirror $MIRROR"
-     $DEBOOTSTRAP $ARCHCMD $RELEASE $MNTPOINT $MIRROR
+     einfo "Running $DEBOOTSTRAP for release ${RELEASE}${ARCHINFO} using ${MIRROR}${ISO}"
+     [ -n "$MIRROR" ] && $DEBOOTSTRAP $ARCHCMD $RELEASE $MNTPOINT $MIRROR || \
+     $DEBOOTSTRAP $ARCHCMD $RELEASE $MNTPOINT $ISO
      eend $?
   else
      eerror "Error: $MNTPOINT not mounted, can not continue."
@@ -308,6 +337,8 @@ preparechroot() {
   cp /etc/debootstrap/packages        $MNTPOINT/etc/debootstrap/packages
   cp /etc/debootstrap/variables       $MNTPOINT/etc/debootstrap/variables
 
+  cp -a /etc/debootstrap/extrapackages/ $MNTPOINT/etc/debootstrap/
+
   # make sure we can access network [relevant for cdebootstrap]
   [ -f "$MNTPOINT/etc/resolv.conf" ] || cp /etc/resolv.conf $MNTPOINT/etc/resolv.conf
 
@@ -355,10 +386,19 @@ grub_install() {
 
 # unmount $MNTPOINRT {{{
 umount_chroot() {
-  if [ -n "$PARTITION" ] ; then
-     einfo "Unmount $MNTPOINT"
-     umount $MNTPOINT
-     eend $?
+  if [ -n "$ISODIR" ] ; then
+     if grep -q "$ISODIR" /proc/mounts ; then
+        einfo "Unmount $MNTPOINT/$ISODIR"
+        umount "$MNTPOINT/$ISODIR"
+        eend $?
+     fi
+  fi
+  if grep -q "$MNTPOINT" /proc/mounts ; then
+     if [ -n "$PARTITION" ] ; then
+        einfo "Unmount $MNTPOINT"
+        umount $MNTPOINT
+        eend $?
+     fi
   fi
 }
 # }}}
@@ -387,7 +427,13 @@ done
   echo done > $STAGES/grml-debootstrap
 # }}}
 
-  einfo "Finished execution of $0 - enjoy your Debian system." ; eend 0
+if [ -n "$AUTOINSTALL" ] ; then
+   dialog --title "$0" --msgbox \
+          "Finished execution of ${0}.
+Enjoy your Debian system." 6 60
+else
+   einfo "Finished execution of $0 - enjoy your Debian system." ; eend 0
+fi
 
 ## END OF FILE #################################################################
 # vim: ai tw=100 expandtab foldmethod=marker