Integrate Debian/squeeze and Debian/wheezy proberly.

diff --git a/config b/config
index d2d7e16..daf4f2e 100644 (file)
--- a/config
+++ b/config
@@ -63,9 +63,9 @@ MIRROR='http://cdn.debian.net/debian'
 # GRMLPACKAGES='grml-etc-core'
 
 # release (which Debian version should be installed)
 # GRMLPACKAGES='grml-etc-core'
 
 # release (which Debian version should be installed)

-# supported values: etch (old-stable), lenny (stable),
-#                   squeeze (testing), sid (unstable)
-RELEASE='lenny'
+# supported values: lenny (old-stable), squeeze (stable),
+#                   wheezy (testing), sid (unstable)
+RELEASE='squeeze'

 
 # define components that should be used within sources.list
 # default:
 
 # define components that should be used within sources.list
 # default:

diff --git a/grml-debootstrap b/grml-debootstrap
index b3fc9da..8d9cffb 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -305,12 +305,13 @@ prompt_for_bootmanager()
 # ask for Debian release {{{
 prompt_for_release()
 {
 # ask for Debian release {{{
 prompt_for_release()
 {

-  [ -n "$RELEASE" ] && DEFAULT_RELEASE="$RELEASE" || DEFAULT_RELEASE='lenny'
+  [ -n "$RELEASE" ] && DEFAULT_RELEASE="$RELEASE" || DEFAULT_RELEASE='squeeze'

   RELEASE="$(dialog --stdout --title "${PN}" --default-item $DEFAULT_RELEASE --menu \
             "Please enter the Debian release you would like to use for installation:" \
   RELEASE="$(dialog --stdout --title "${PN}" --default-item $DEFAULT_RELEASE --menu \
             "Please enter the Debian release you would like to use for installation:" \

-            0 50 3 \
-            lenny    Debian/stable \
-            squeeze  Debian/testing \
+            0 50 4 \
+            lenny    Debian/old-stable \
+            squeeze  Debian/stable \
+            wheezy   Debian/testing \

             sid      Debian/unstable)"
 }
 # }}}
             sid      Debian/unstable)"
 }
 # }}}

diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt
index 7eca4c0..790654c 100644 (file)
--- a/grml-debootstrap.8.txt
+++ b/grml-debootstrap.8.txt
@@ -138,7 +138,7 @@ Options and environment variables
 *-r*, *--release* <_releasename_>::
 
     Specify release of new Debian system. Supported releases names: lenny,
 *-r*, *--release* <_releasename_>::
 
     Specify release of new Debian system. Supported releases names: lenny,

-    squeeze (note: requires current version of debootstrap) and sid.
+    squeeze, wheezy (note: requires current version of debootstrap) and sid.

     Corresponding with configuration variable RELEASE.
 
 *--pre-scripts* <_directory_>::
     Corresponding with configuration variable RELEASE.
 
 *--pre-scripts* <_directory_>::


@@ -177,7 +177,7 @@ Usage examples
 
   grml-debootstrap --target /dev/sda1 --grub /dev/sda
 
 
   grml-debootstrap --target /dev/sda1 --grub /dev/sda
 

-Install default Debian release (stable/lenny) on /dev/sda1 and install bootmanager
+Install default Debian release (stable/squeeze) on /dev/sda1 and install bootmanager

 Grub in MBR (master boot record) of /dev/sda and use /dev/sda1 as system partition.
 
   grml-debootstrap --target /dev/sda6 --grub /dev/sda --release sid
 Grub in MBR (master boot record) of /dev/sda and use /dev/sda1 as system partition.
 
   grml-debootstrap --target /dev/sda6 --grub /dev/sda --release sid


@@ -188,19 +188,19 @@ Install Debian unstable/sid on /dev/sda6, install bootmanager Grub in MBR
   mount /dev/sda1 /data/chroot
   grml-debootstrap --target /data/chroot
 
   mount /dev/sda1 /data/chroot
   grml-debootstrap --target /data/chroot
 

-Install default Debian release (stable/lenny) in directory /data/chroot (without
+Install default Debian release (stable/squeeze) in directory /data/chroot (without

 any bootloader).
 
   grml-debootstrap --target /dev/sda3 --grub /dev/sda  --mirror ftp://ftp.tugraz.at/mirror/debian
 
 any bootloader).
 
   grml-debootstrap --target /dev/sda3 --grub /dev/sda  --mirror ftp://ftp.tugraz.at/mirror/debian
 

-Install default Debian release (stable/lenny) on /dev/sda3 and install bootmanager
+Install default Debian release (stable/squeeze) on /dev/sda3 and install bootmanager

 Grub in MBR (master boot record) of /dev/sda and use /dev/sda3 as system partition.
 Use specified mirror instead of the default (ftp://ftp.debian.de/debian) one.
 
   mount -o loop /mnt/sda6/debian-40r0-i386-CD-1.iso /mnt/iso
   grml-debootstrap --target /dev/sda1 --grub /dev/sda --iso file:/mnt/iso/debian/
 
 Grub in MBR (master boot record) of /dev/sda and use /dev/sda3 as system partition.
 Use specified mirror instead of the default (ftp://ftp.debian.de/debian) one.
 
   mount -o loop /mnt/sda6/debian-40r0-i386-CD-1.iso /mnt/iso
   grml-debootstrap --target /dev/sda1 --grub /dev/sda --iso file:/mnt/iso/debian/
 

-Install Debian stable/lenny on /dev/sda1 using the loopback mounted Debian-ISO
+Install Debian stable/squeeze on /dev/sda1 using the loopback mounted Debian-ISO

 for the base-system and install bootmanager Grub in MBR (master boot record) of
 /dev/sda and use /dev/sda1 as system partition. Please notice, that the chroot
 system requires network access for all packages which are not part of the
 for the base-system and install bootmanager Grub in MBR (master boot record) of
 /dev/sda and use /dev/sda1 as system partition. Please notice, that the chroot
 system requires network access for all packages which are not part of the


@@ -282,7 +282,7 @@ Where do you want to install grub to? Usage example: grub=/dev/sda
   release=...
 
 Specify release of new Debian system. Defaults to Debian stable.  Supported
   release=...
 
 Specify release of new Debian system. Defaults to Debian stable.  Supported

-relases: lenny, squeeze and sid. Usage example: release=sid
+relases: lenny, squeeze, wheezy and sid. Usage example: release=sid

 
   mirror=...
 
 
   mirror=...