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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 93d675f42a3caa1d9ce6087b10225e42313ec963
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Mar 22 21:35:49 2009 +0100

    Added switch for mounting /proc
    
    Luca is most probably right when he says that proc is not needed in
    chroot for the minimal set of tools that install.sh is primarily
    aiming at. Even when deboostrap does mount it, this is no excuse for other
    packages to depend on it.  This patch adds the option "--mount-proc"
    to install.sh. /proc is only mounted with that option given, so issues
    continue to be spotted by default. It seems like a good compromise
    for the moment.

diff --git a/install.sh b/install.sh
index 3129466..59596da 100755
--- a/install.sh
+++ b/install.sh
@@ -76,6 +76,7 @@ VERBOSE=${VERBOSE:-}
 TESTHOST=${TESTHOST:-www.debian.org}
 RDATEHOST=${RDATEHOST:-ntp.fu-berlin.de}
 DROPBEAR_KEYS="/etc/dropbear/dropbear_rsa_host_key /etc/dropbear/dropbear_dss_host_key"
+MOUNT_PROC=""
 
 # internal variables
 intern_instdir_already_present="" 
@@ -123,6 +124,10 @@ TAR_PACKAGE=$INST_MIRROR/pool/main/t/tar/tar_1.20-1_armel.deb
 # installed. cdebootstrap is installing it itself.
 ensure_proc_is_mounted () {
 
+	if  [ -z "$MOUNT_PROC" ]; then
+		return 0;
+	fi
+
 	if [ ! -d "$INST_DIR/proc" ]; then mkdir "$INST_DIR/proc"; fi
 
 	if mount | grep -q "$INST_DIR/proc"; then
@@ -325,6 +330,8 @@ OPTIONS
                      sets the APT_OPTIONS variable
 	--hostname <name>
                      sets the HOSTNAME variable
+	--mount-proc
+                     mounts /proc directory in Debian chroot
 	--part1-fs <vfat|ext2|ext3>
                      sets the SD_PART1_FS variable
 	--part1-size <megabytes>
@@ -1343,7 +1350,9 @@ do
                         assignParametername="$i"
 			assignVariablename="TASKS"
 			;;
-
+		 "--mount-proc")
+			MOUNT_PROC="true"
+			;;
 		 "all")
 			action_testing
 			action_time

-- 
Various non-packaged files