projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reworked integrity-check (Closes: #507477).
[live-boot-grml.git]
/
scripts
/
live-helpers
diff --git
a/scripts/live-helpers
b/scripts/live-helpers
index
44bb12a
..
f6b8b8b
100644
(file)
--- a/
scripts/live-helpers
+++ b/
scripts/live-helpers
@@
-275,7
+275,11
@@
try_mount ()
if [ -n "${old_mountp}" ]
then
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}" ]
mount -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
else
if [ -z "${fstype}" ]
@@
-313,6
+317,13
@@
find_cow_device ()
return
fi
return
fi
+ if [ "${PERSISTENT}" = "nofiles" ]
+ then
+ # do not mount the device to find for image files
+ # just skip this
+ break
+ fi
+
case "$(get_fstype ${devname})" in
vfat|ext2|ext3|jffs2)
mkdir -p "${cow_backing}"
case "$(get_fstype ${devname})" in
vfat|ext2|ext3|jffs2)
mkdir -p "${cow_backing}"