[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. 6945d74477fc172c680452555c722b805c515a70

[Luca Capello]

The following commit has been merged in the master branch:
commit 6945d74477fc172c680452555c722b805c515a70
Author: Luca Capello <luca at pca.it>
Date:   Sat Jun 6 13:45:36 2009 +0200

    install.sh: add user variable ROOT_PASSWORD

diff --git a/install.sh b/install.sh
index cbab792..a3be9e3 100755
--- a/install.sh
+++ b/install.sh
@@ -56,6 +56,7 @@ INST_MIRROR=${INST_MIRROR:-http://ftp2.de.debian.org/debian}
 LOCALEPURGE=${LOCALEPURGE:-}
 QI=${QI:-false}
 QI_VERBOSE_BOOT=${QI_VERBOSE_BOOT:-false}
+ROOT_PASSWORD=${ROOT_PASSWORD:-changeme}
 SD_DEVICE=${SD_DEVICE:-/dev/mmcblk0}
 SD_PART1_FS=${SD_PART1_FS:-ext2}
 SD_PART1_SIZE=${SD_PART1_SIZE:-8}
@@ -68,7 +69,7 @@ ZHONE=${ZHONE:-true}
 lc SD_PART1_FS SD_PART2_FS APT_RECOMMENDS QI QI_VERBOSE_BOOT FSO_DEVICE
 
 # general variables
-VERSION=2.0
+VERSION=3.0
 VERBOSE=${VERBOSE:-}
 TESTHOST=${TESTHOST:-www.debian.org}
 RDATEHOST=${RDATEHOST:-ntp.fu-berlin.de}
@@ -201,6 +202,22 @@ __END__
 
 }
 
+root_password_warning () {
+	cat <<__END__
+***********
+* WARNING *
+***********
+
+Starting from version 3.0, the root password is no more empty,
+but defaults to 'changeme'.  You can configure it through the
+ROOT_PASSWORD variable.
+
+Press any key within 5 seconds to quit
+__END__
+
+	five_seconds_to_quit
+
+}
 
 usage () {
 	cat <<__END__
@@ -274,6 +291,7 @@ ENVIRONMENT
                      a LOT of disk space; set to none if you do not
                      want a Display Manager)
 	ZHONE        set this to true to install the Zhone GUI (set to '$ZHONE')
+	ROOT_PASSWORD  the password for the root account (set to '$ROOT_PASSWORD')
 
     Stages:
 
@@ -922,6 +940,8 @@ action_tasks () {
 action_configuration () {
 	echo "Configuring system files for ${FSO_DEVICE}"
 
+	root_password_warning
+
 	ensure_proc_is_mounted
 
 	if [ "true" = "$LOCALEPURGE" ]; then
@@ -1062,8 +1082,11 @@ __END__
 		cat > "$INST_DIR$FILE" <$FILE
 	done
 
-	echo " * Setting empty root password"
-	echo 'root:' | chroot "$INST_DIR" chpasswd
+	# empty passwords now require modification to PAM
+	# http://lists.alioth.debian.org/pipermail/pkg-fso-maint/2009-May/001225.html
+	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525153
+	echo " * Setting root password to '$ROOT_PASSWORD'"
+	echo "root:$ROOT_PASSWORD" | chroot "$INST_DIR" chpasswd
 
 	for HOST_KEY in $DROPBEAR_KEYS; do
 		if [ -f "$HOST_KEY" ]; then

-- 
Various non-packaged files