don't fail to ask for a password if there is no TTY

[grml-debootstrap.git] / grml-debootstrap

diff --git a/grml-debootstrap b/grml-debootstrap
index 3085637..cbd1938 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -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'
@@ -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,
@@ -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
 }
@@ -729,6 +730,12 @@ else # if not running automatic installation display configuration and prompt fo
       [ -n "$VMSIZE" ] && echo "   Using Virtual Disk file with size of ${VMSIZE}."
    fi
 
+   if [ ! -t 0 -a -z "$ROOTPASSWORD" -a -z "$NOPASSWORD" ] ; then
+      echo
+      echo "   You do not have a TTY allocated, your password will be shown in"
+      echo "   plaintext on the terminal! If you are using SSH, try its -t option!"
+   fi
+
    echo
    echo "   Important! Continuing will delete all data from ${TARGET}!"
 
@@ -1017,6 +1024,9 @@ finalize_vm() {
   rm -f "${MNTPOINT}/tmp/core.img"
 
   einfo "Updating grub configuration file."
+  if [ -n "$BOOT_APPEND" ] ; then
+     sed -i "/GRUB_CMDLINE_LINUX_DEFAULT/ s#\"\$# ${BOOT_APPEND}\"#" "${MNTPOINT}"/etc/default/grub
+  fi
   chroot "${MNTPOINT}" update-grub
 
   umount "${MNTPOINT}"/proc
@@ -1088,6 +1098,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