[SCM] live-boot branch, debian-old-3.0, updated. debian/3.0_b4-1-2-ge182c1d

[Daniel Baumann]

The following commit has been merged in the debian-old-3.0 branch:
commit e182c1d4f7ec50f1498d900f7c6250191537457f
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Sep 30 09:54:59 2012 +0200

    Removing showmounts option as it's enable always anyway.

diff --git a/scripts/boot/9990-cmdline-old b/scripts/boot/9990-cmdline-old
index 7a6ce43..85f1b62 100755
--- a/scripts/boot/9990-cmdline-old
+++ b/scripts/boot/9990-cmdline-old
@@ -203,11 +203,6 @@ Cmdline_old ()
 				export QUICKUSBMODULES
 				;;
 
-			showmounts)
-				SHOWMOUNTS="true"
-				export SHOWMOUNTS
-				;;
-
 			todisk=*)
 				TODISK="${_PARAMETER#todisk=}"
 				export TODISK
diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh
index 8283c73..3ee382e 100755
--- a/scripts/boot/9990-overlay.sh
+++ b/scripts/boot/9990-overlay.sh
@@ -350,34 +350,28 @@ setup_unionfs ()
 	fi
 
 	live_rofs_list=""
-	# SHOWMOUNTS is necessary for custom mounts with the union option
-	# Since we may want to do custom mounts in user-space it's best to always enable SHOWMOUNTS
-	if true #[ -n "${SHOWMOUNTS}" ] || ( [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ] 1)
-	then
-		# XXX: is the for loop really necessary? rofslist can only contain one item (see above XXX about EXPOSEDROOT) and this is also assumed elsewhere above (see use of $rofs above).
-		for d in ${rofslist}
-		do
-			live_rofs="/live/rofs/${d##*/}"
-			live_rofs_list="${live_rofs_list} ${live_rofs}"
-			mkdir -p "${live_rofs}"
-			case d in
-				*.dir)
-					# do nothing # mount -o bind "${d}" "${live_rofs}"
-					;;
-				*)
-					case "${UNIONTYPE}" in
-						unionfs-fuse)
-							mount -o bind "${d}" "${live_rofs}"
-							;;
-
-						*)
-							mount -o move "${d}" "${live_rofs}"
-							;;
-					esac
-					;;
-			esac
-		done
-	fi
+	for d in ${rofslist}
+	do
+		live_rofs="/live/rofs/${d##*/}"
+		live_rofs_list="${live_rofs_list} ${live_rofs}"
+		mkdir -p "${live_rofs}"
+		case d in
+			*.dir)
+				# do nothing # mount -o bind "${d}" "${live_rofs}"
+				;;
+			*)
+				case "${UNIONTYPE}" in
+					unionfs-fuse)
+						mount -o bind "${d}" "${live_rofs}"
+						;;
+
+					*)
+						mount -o move "${d}" "${live_rofs}"
+						;;
+				esac
+				;;
+		esac
+	done
 
 	# Adding custom persistence
 	if [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ]

-- 
live-boot