Drop $CHROOTMIRROR variable

diff --git a/TODO b/TODO
index 01aae5d..ac3bb8c 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,16 +1,6 @@
 TODO list for grml-debootstrap
 ==============================
 
-Important
----------
-
-* support for SW-RAID (work in progress, needs work on bootloader)
-* prompt for root password in interactive setup
-* support execution of additional scripts for further customization
-
-Would be nice to have
----------------------
-
 * support for LVM
 * support grub2
 * support tarballs for customization/mirror source
@@ -29,5 +19,4 @@ Would be nice to have
 * support installation on usb-pen (like grml2usb for Debian)
   -> http://blog.256bit.org/archives/172-Debian-in-der-Hosentasche.html#extended
 * support adduser for new user who has same permissions as an user created by d-i
-* support adding own sources.list entries
-* test support for Ubuntu dapper, edgy, feisty, and gutsy as debootstrap 1.0.0 provides support for it
+* test support for Ubuntu as debootstrap >=1.0.0 provides support for it

diff --git a/chroot-script b/chroot-script
index 0e93220..c59f455 100755 (executable)
--- a/chroot-script
+++ b/chroot-script
@@ -49,10 +49,10 @@ chrootmirror() {
   [ -n "$KEEP_SRC_LIST" ] && return
   if [ -n "$ISO" ] ; then
      echo "deb $ISO $RELEASE main contrib" > /etc/apt/sources.list
-     [ -n "$CHROOTMIRROR" ] && echo "deb $CHROOTMIRROR $RELEASE main contrib non-free" >> /etc/apt/sources.list
+     [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE main contrib non-free" >> /etc/apt/sources.list
   else
-    if [ -n "$CHROOTMIRROR" ] ; then
-       echo "deb $CHROOTMIRROR $RELEASE main contrib non-free" > /etc/apt/sources.list
+    if [ -n "$MIRROR" ] ; then
+       echo "deb $MIRROR $RELEASE main contrib non-free" > /etc/apt/sources.list
     fi
   fi
 }

diff --git a/config b/config
index ce68e20..bd8dcca 100644 (file)
--- a/config
+++ b/config
@@ -46,20 +46,19 @@ BOOT_APPEND=''
 ################################################################################
 # Now the variables you might want to adjust, but need not to...
 
-# set mirror where debootstrap should download packages from
-MIRROR='ftp://ftp.debian.de/debian'
-
-# specify entry which should be used for /etc/apt/sources.list,
-# if empty then existing /etc/apt/sources.list will be taken
-CHROOTMIRROR='ftp://ftp.debian.de/debian'
+# set mirror where debootstrap and chrootscript should download
+# packages from; if empty an existing
+# /etc/debootstrap/etc/apt/sources.list is used instead
+MIRROR='ftp://ftp.de.debian.org/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/'
 
-# do not build /etc/apt/sources.list on the fly. This allow user to
-# provide their own apt sources.list from /etc/debootstrap/etc/apt/sources.list
+# If /etc/apt/sources.list should NOT be build on the fly, this
+# options allows providing a separate apt file via
+# /etc/debootstrap/etc/apt/sources.list
 # KEEP_SRC_LIST='yes'
 
 # add grml repository to /etc/apt/sources.list

diff --git a/debian/changelog b/debian/changelog
index 709feba..323ba0c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ grml-debootstrap (0.24) unstable; urgency=low
   * Add initial support for Debian/squeeze and drop sarge instead.
   * Update VCS*-headers and long description of Debian package.
   * Move asciidoc, docbook-xsl, xsltproc to Build-Depends-Indep.
+  * Drop $CHROOTMIRROR variable, instead use $MIRROR for debootstrap
+    as well as inside the chroot.
 
- -- Michael Prokop <mika@grml.org>  Wed, 04 Mar 2009 17:37:16 +0100
+ -- Michael Prokop <mika@grml.org>  Wed, 04 Mar 2009 18:53:21 +0100
 
 grml-debootstrap (0.23) unstable; urgency=low
 

diff --git a/grml-debootstrap b/grml-debootstrap
index d80e583..2e419a8 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -735,7 +735,6 @@ preparechroot() {
   [ -n "$HOSTNAME" ]     && echo "HOSTNAME=$HOSTNAME"         >> $CHROOT_VARIABLES
   [ -n "$ISODIR" ]       && echo "ISODIR=$ISO"                >> $CHROOT_VARIABLES
   [ -n "$ISO" ]          && echo "ISO=$ISO"                   >> $CHROOT_VARIABLES
-  [ -n "$MIRROR" ]       && echo "CHROOTMIRROR=$MIRROR"       >> $CHROOT_VARIABLES
   [ -n "$MIRROR" ]       && echo "MIRROR=$MIRROR"             >> $CHROOT_VARIABLES
   [ -n "$KEEP_SRC_LIST" ] && echo "KEEP_SRC_LIST=$KEEP_SRC_LIST" >> $CHROOT_VARIABLES
   [ -n "$PACKAGES" ]     && echo "PACKAGES=$PACKAGES"         >> $CHROOT_VARIABLES

diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt
index a36f107..2c69412 100644 (file)
--- a/grml-debootstrap.8.txt
+++ b/grml-debootstrap.8.txt
@@ -91,9 +91,8 @@ Options and environment variables
 
 *-m*, *--mirror* <_URL_>::
 
-    Specify mirror which should be used for apt-get/aptitude. Notice that
-    specifying the mirror also sets the chrootmirror to the given value.
-    Corresponding with configuration variables MIRROR and CHROOTMIRROR.
+    Specify mirror which should be used for apt-get/aptitude.
+    Corresponding with configuration variable MIRROR.
 
 *--nodebootstrap*::