X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=62e2c7ee179bbef1ebcfa1ceb086cc074ad40de2;hp=6b5fa173be284b9981068475a4c7b29e4640e1ef;hb=4a6922bbd428695ca1ee1833ff04b53c436d8453;hpb=488643ab1a3e97a77bdb01f1070c8e83c6b346f9

diff --git a/grml-debootstrap b/grml-debootstrap
index 6b5fa17..62e2c7e 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -20,7 +20,7 @@ DEBCONF='yes'
 DEBIAN_FRONTEND='noninteractive'
 DEBOOTSTRAP='debootstrap'
 EXTRAPACKAGES='yes'
-FALLBACK_MIRROR='http://cdn.debian.net/debian'
+FALLBACK_MIRROR='http://http.debian.net/debian'
 FORCE=''
 HOSTNAME='grml'
 INITRD='yes'
@@ -557,7 +557,7 @@ prompt_for_mirror()
   [ $? -eq 0 ] || bailout
 
   if [ "$CHOOSE_MIRROR" = 'net' ] ; then
-     [ -n "$MIRROR" ] || MIRROR='http://cdn.debian.net/debian'
+     [ -n "$MIRROR" ] || MIRROR='http://http.debian.net/debian'
      MIRROR="$(dialog --stdout --title "${PN}" --inputbox \
                "Please enter Debian mirror you would like to use for installing packages." \
                0 0 $MIRROR)"
@@ -730,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}!"