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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit c5c5b94356489a28bcb24992e53b19c85dea2379
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Sep 20 12:12:17 2009 +0200

    Rendering /proc to be mounted the default
    
    and adding --no-mount-proc option to undo.

diff --git a/install.sh b/install.sh
index a9e7573..7a113db 100755
--- a/install.sh
+++ b/install.sh
@@ -85,7 +85,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=""
+MOUNT_PROC=true
 
 # internal variables
 intern_instdir_already_present="" 
@@ -146,6 +146,9 @@ TAR_APPLICATION=tar
 ensure_proc_is_mounted () {
 
 	if  [ -z "$MOUNT_PROC" ]; then
+		if [ ! -r "$INST_DIR"/proc/cpuinfo ]; then
+			echo "W: /proc not mounted in chroot, install may fail."
+		fi
 		return 0;
 	fi
 
@@ -1648,6 +1651,9 @@ do
 		 "--mount-proc")
 			MOUNT_PROC="true"
 			;;
+		 "--no-mount-proc")
+			MOUNT_PROC=""
+			;;
 		 "--no-partitioning")
 			intern_no_partitioning="true"
 			;;

-- 
Various non-packaged files