Merging casper 1.148.

grml · Nov 22, 2008 · 78c3484 · 78c3484
1 parent b04b727
commit 78c3484
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
@@ -1,3 +1,10 @@
+casper (1.148) intrepid; urgency=low
+
+  * Skip remounting read-only in try_mount as it's unnecessary and
+    breaks persistence.  Thanks James Westby (LP: #274076).
+
+ -- Evan Dandrea <evand@ubuntu.com>  Wed, 15 Oct 2008 13:13:38 -0400
+
 casper (1.147) intrepid; urgency=low
 
   * Fix path to Kubuntu help file in 10adduser

diff --git a/scripts/live-helpers b/scripts/live-helpers
@@ -275,7 +275,11 @@ try_mount ()
 
 	if [ -n "${old_mountp}" ]
 	then
-		mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+		if [ "${opts}" != "ro" ]
+		then
+			mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+		fi
+
 		mount -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
 	else
 		if [ -z "${fstype}" ]