From: Michael Prokop <mika@grml.org>
Date: Mon, 31 Dec 2012 22:53:38 +0000 (+0100)
Subject: Merge branch 'mika/wheezy_release'
X-Git-Tag: v0.55~3
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=488643ab1a3e97a77bdb01f1070c8e83c6b346f9;hp=-c

Merge branch 'mika/wheezy_release'
---

488643ab1a3e97a77bdb01f1070c8e83c6b346f9
diff --combined grml-debootstrap
index 8667738,dcd2b7b..6b5fa17
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@@ -20,18 -20,17 +20,18 @@@ DEBCONF='yes
  DEBIAN_FRONTEND='noninteractive'
  DEBOOTSTRAP='debootstrap'
  EXTRAPACKAGES='yes'
 +FALLBACK_MIRROR='http://cdn.debian.net/debian'
  FORCE=''
  HOSTNAME='grml'
  INITRD='yes'
  INSTALL_NOTES='/etc/debootstrap/install_notes'
  LOCALES='yes'
 -MIRROR='http://cdn.debian.net/debian'
 +MIRROR="$FALLBACK_MIRROR"
  MKFS='mkfs.ext3'
  PACKAGES='yes'
  PRE_SCRIPTS='yes'
  RECONFIGURE='console-data'
- RELEASE='squeeze'
+ RELEASE='wheezy'
  RM_APTCACHE='yes'
  SCRIPTS='yes'
  SECURE='yes'
@@@ -60,7 -59,7 +60,7 @@@ Bootstrap options
    -m, --mirror <URL>     Mirror which should be used for apt-get/aptitude.
    -i, --iso <mnt>        Mountpoint where a Debian ISO is mounted to, for use
                           instead of fetching packages from a mirror.
-   -r, --release <name>   Release of new Debian system (default: squeeze).
+   -r, --release <name>   Release of new Debian system (default: wheezy).
    -t, --target <target>  Target partition (/dev/...) or directory where the
                           system should be installed to.
    -p, --mntpoint <mnt>   Mountpoint used for mounting the target system,
@@@ -494,13 -493,13 +494,13 @@@ prompt_for_bootmanager(
  # ask for Debian release {{{
  prompt_for_release()
  {
-   [ -n "$RELEASE" ] && DEFAULT_RELEASE="$RELEASE" || DEFAULT_RELEASE='squeeze'
+   [ -n "$RELEASE" ] && DEFAULT_RELEASE="$RELEASE" || DEFAULT_RELEASE='wheezy'
    RELEASE="$(dialog --stdout --title "${PN}" --default-item $DEFAULT_RELEASE --menu \
              "Please enter the Debian release you would like to use for installation:" \
              0 50 4 \
-             lenny    Debian/old-stable \
-             squeeze  Debian/stable \
-             wheezy   Debian/testing \
+             lenny    Debian/5.0 \
+             squeeze  Debian/6.0 \
+             wheezy   Debian/7.0 \
              sid      Debian/unstable)"
    [ $? -eq 0 ] || bailout
  }
@@@ -846,7 -845,7 +846,7 @@@ if [ -n "$ISO" ] ; the
        file*) # do nothing
        ;;
        *)
 -      ISO=file:$1
 +      ISO=file:$ISO
        ;;
     esac
  fi
@@@ -854,12 -853,6 +854,12 @@@ ISODIR=${ISO##file:
  ISODIR=${ISODIR%%/}
  # }}}
  
 +# Debian ISOs do not contain signed Release files {{{
 +if [ -n "$ISO" ] ; then
 +    DEBOOTSTRAP_OPT="$DEBOOTSTRAP_OPT --no-check-gpg"
 +fi
 +# }}}
 +
  # create filesystem {{{
  mkfs() {
    if [ -n "$DIRECTORY" ] ; then
@@@ -1051,16 -1044,15 +1051,16 @@@ debootstrap_system() 
      eend 1 ; exit 1
    fi
  
 -  einfo "Running $DEBOOTSTRAP $DEBOOTSTRAP_OPT for release ${RELEASE}${ARCHINFO} using ${MIRROR}${ISO}"
 -  if [ -n "$MIRROR" ] ; then
 -    einfo "Executing: $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR"
 -    $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR
 -    RC=$?
 -  else
 +  if [ -n "$ISO" ] ; then
 +    einfo "Running $DEBOOTSTRAP $DEBOOTSTRAP_OPT for release ${RELEASE}${ARCHINFO} using ${ISO}"
      einfo "Executing: $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $ISO"
      $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $ISO
      RC=$?
 +  else
 +    einfo "Running $DEBOOTSTRAP $DEBOOTSTRAP_OPT for release ${RELEASE}${ARCHINFO} using ${MIRROR}"
 +    einfo "Executing: $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR"
 +    $DEBOOTSTRAP $ARCHCMD $KEYRING $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR
 +    RC=$?
    fi
  
    if [ $RC -ne 0 ] ; then
@@@ -1092,7 -1084,6 +1092,7 @@@ preparechroot() 
    [ -n "$DEBIAN_FRONTEND" ]     && echo "DEBIAN_FRONTEND=\"$DEBIAN_FRONTEND\""         >> $CHROOT_VARIABLES
    [ -n "$DEBOOTSTRAP" ]         && echo "DEBOOTSTRAP=\"$DEBOOTSTRAP\""                 >> $CHROOT_VARIABLES
    [ -n "$EXTRAPACKAGES" ]       && echo "EXTRAPACKAGES=\"$EXTRAPACKAGES\""             >> $CHROOT_VARIABLES
 +  [ -n "$FALLBACK_MIRROR" ]     && echo "FALLBACK_MIRROR=\"$FALLBACK_MIRROR\""         >> $CHROOT_VARIABLES
    [ -n "$FORCE" ]               && echo "FORCE=\"$FORCE\""                             >> $CHROOT_VARIABLES
    [ -n "$GRMLREPOS" ]           && echo "GRMLREPOS=\"$GRMLREPOS\""                     >> $CHROOT_VARIABLES
    [ -n "$GRUB" ]                && echo "GRUB=\"$GRUB\""                               >> $CHROOT_VARIABLES