projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Including wc in initramfs (Closes: #512413).
[live-boot-grml.git]
/
scripts
/
live-helpers
diff --git
a/scripts/live-helpers
b/scripts/live-helpers
index
a935001
..
adb56b7
100644
(file)
--- a/
scripts/live-helpers
+++ b/
scripts/live-helpers
@@
-77,7
+77,7
@@
get_fstype ()
return
fi
return
fi
- eval $(fstype
<
${1} 2>/dev/null)
+ eval $(fstype ${1} 2>/dev/null)
if [ "${FSTYPE}" != "unknown" ]
then
if [ "${FSTYPE}" != "unknown" ]
then
@@
-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}" ]