diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-11-11 18:14:20 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:03 +0100 |
| commit | 89bcde16a95dfd84c653cb95b9a5ab966fd8d4da (patch) | |
| tree | 35c81184543c4396590c1dfd32bf5f9e1742c410 | |
| parent | 84ec5ec4ecd84b384411b376b936e41b0d79af46 (diff) | |
| download | live-boot-89bcde16a95dfd84c653cb95b9a5ab966fd8d4da.tar.gz live-boot-89bcde16a95dfd84c653cb95b9a5ab966fd8d4da.zip | |
Merging casper 1.148.
| -rw-r--r-- | docs/ChangeLog.casper | 7 | ||||
| -rw-r--r-- | scripts/live-helpers | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 73bb17f..e15c933 100644 --- 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 index a935001..f6b8b8b 100644 --- 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}" ] |