projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release new version 0.55
[grml-debootstrap.git]
/
grml-debootstrap
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
6b5fa17
..
62e2c7e
100755
(executable)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-20,7
+20,7
@@
DEBCONF='yes'
DEBIAN_FRONTEND='noninteractive'
DEBOOTSTRAP='debootstrap'
EXTRAPACKAGES='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'
FORCE=''
HOSTNAME='grml'
INITRD='yes'
@@
-557,7
+557,7
@@
prompt_for_mirror()
[ $? -eq 0 ] || bailout
if [ "$CHOOSE_MIRROR" = 'net' ] ; then
[ $? -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)"
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
[ -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}!"
echo
echo " Important! Continuing will delete all data from ${TARGET}!"