Fix typo in grml-repos code; use new stages in chroot-script as well now

diff --git a/chroot-script b/chroot-script
index 4c43406..6f128c1 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.
 # 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:39:21 CEST 2007 [mika]
+# Latest change: Mon Apr 23 00:22:33 CEST 2007 [mika]

 ################################################################################
 
 set -e # exit on any error
 ################################################################################
 
 set -e # exit on any error


@@ -55,14 +55,15 @@ chrootmirror() {
 grmlrepos() {
   if [ -n "$GRMLREPOS" ] ; then
      cat >> /etc/apt/sources.list << EOF
 grmlrepos() {
   if [ -n "$GRMLREPOS" ] ; then
      cat >> /etc/apt/sources.list << EOF

-# stable repository:
+
+# grml: stable repository:

   deb     http://deb.grml.org/ grml-stable  main
   deb-src http://deb.grml.org/ grml-stable  main
 
   deb     http://deb.grml.org/ grml-stable  main
   deb-src http://deb.grml.org/ grml-stable  main
 

-# testing/development repository:
+# grml: testing/development repository:

   deb     http://deb.grml.org/ grml-testing main
   deb-src http://deb.grml.org/ grml-testing main
   deb     http://deb.grml.org/ grml-testing main
   deb-src http://deb.grml.org/ grml-testing main

-'
+

 EOF
   fi
 }
 EOF
   fi
 }


@@ -107,11 +108,11 @@ packages() {
 
 # install extra packages {{{
 extrapackages() {
 
 # install extra packages {{{
 extrapackages() {

-    if [ "$EXTRAPACKAGES" = 'yes' ] ; then 
+    if [ "$EXTRAPACKAGES" = 'yes' ] ; then

         PACKAGELIST=$(find /etc/debootstrap/extrapackages -type f -name '*.deb')
         if [ -n "$PACKAGELIST" ]; then
             dpkg -i $PACKAGELIST
         PACKAGELIST=$(find /etc/debootstrap/extrapackages -type f -name '*.deb')
         if [ -n "$PACKAGELIST" ]; then
             dpkg -i $PACKAGELIST

-            # run apt again to resolve any deps 
+            # run apt again to resolve any deps

             DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL
         fi
     fi
             DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL
         fi
     fi


@@ -387,25 +388,13 @@ finalize() {
 # }}}
 
 # execute the functions {{{
 # }}}
 
 # execute the functions {{{

-  stage chrootmirror   && chrootmirror   && stage chrootmirror done
-  stage grmlrepos      && grmlrepos      && stage grmlrepos done
-  stage kernelimg_conf && kernelimg_conf && stage kernelimg_conf done
-  stage makedev        && makedev        && stage makedev done
-  stage packages       && packages       && stage packages done
-  stage extrapackages  && extrapackages  && stage extrapackages done
-  stage mkinitrd       && mkinitrd       && stage mkinitrd done
-  stage kernel         && kernel         && stage kernel done
-  stage reconfigure    && reconfigure    && stage reconfigure done
-  stage hosts          && hosts          && stage hosts done
-  stage interfaces     && interfaces     && stage interfaces done
-  stage timezone       && timezone       && stage timezone done
-  stage fstab          && fstab          && stage fstab done
-  stage hostname       && hostname       && stage hostname done
-  stage initrd         && initrd         && stage initrd done
-  stage grub           && grub           && stage grub done
-  stage passwords      && passwords      && stage passwords done
-  stage services       && services       && stage services done
-  stage finalize       && finalize       && stage finalize done
+ for i in chrootmirror grmlrepos kernelimg_conf makedev packages extrapackages \
+     mkinitrd kernel reconfigure hosts interfaces timezone fstab hostname \
+     initrd grub passwords services finalize ; do
+    if stage $i ; then
+       $i && stage $i done || exit 1
+    fi
+  done

 # }}}
 
 # finally exit the chroot {{{
 # }}}
 
 # finally exit the chroot {{{

diff --git a/debian/changelog b/debian/changelog
index 29e3318..939642f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
 grml-debootstrap (0.9) unstable; urgency=low
 
 grml-debootstrap (0.9) unstable; urgency=low
 

+  [ Alexander Wirt ]

   * Add support for EXTRAPACKAGES that can be dropped in
     /etc/debootstrap/extrapackages
   * Add boot_append option to manpage
   * Add support for EXTRAPACKAGES that can be dropped in
     /etc/debootstrap/extrapackages
   * Add boot_append option to manpage

-  * Manpage reformatted  
+  * Manpage reformatted

 
 

- -- Alexander Wirt <formorer@debian.org>  Sun, 22 Apr 2007 12:35:32 +0200
+  [ Michael Prokop ]
+  * Support grml-repository and installation of grml-kernel
+    via GRMLREPOS and GRMLPACKAGES.
+  * Use stage logic inside chroot-script as well.
+
+ -- Michael Prokop <mika@grml.org>  Mon, 23 Apr 2007 00:23:19 +0200

 
 grml-debootstrap (0.8) unstable; urgency=low
 
 
 grml-debootstrap (0.8) unstable; urgency=low