[SCM] debian-live branch, master, updated. 1.130.1-3-38-g256a921
Daniel Baumann
daniel at debian.org
Mon Jun 16 13:59:04 UTC 2008
The following commit has been merged in the master branch:
commit 256a921599433a2e7f0453f036661996434cf15c
Author: Marco Amadori <amadorim at vdavda.com>
Date: Fri Jun 13 15:00:12 2008 +0200
live-snapshot: fixed the remount helper.
* Now it should work even if not using klibc's "read".
diff --git a/scripts/live-helpers b/scripts/live-helpers
index 20952f3..b8b9cf1 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -72,12 +72,9 @@ where_is_mounted ()
if grep -q "^${device} " /proc/mounts
then
- grep "^${device} " /proc/mounts | read d mountpoint rest
- echo ${mountpoint}
- return 0
+ # return the first found
+ grep "^${device} " /proc/mounts | cut -f2 -d ' '
fi
-
- return 1
}
lastline ()
@@ -120,9 +117,9 @@ fs_size ()
if [ -z "${mountp}" ]
then
- mountp=$(where_is_mounted "${dev}")
+ mountp="$(where_is_mounted ${dev})"
- if [ "${?}" -gt 0 ]
+ if [ -z "${mountp}" ]
then
mountp="/mnt/tmp_fs_size"
@@ -243,10 +240,12 @@ try_mount ()
mountp="${2}"
opts="${3}"
- if where_is_mounted ${dev} > /dev/null
+ old_mountp="$(where_is_mounted ${dev})"
+
+ if [ -n "${old_mountp}" ]
then
- mount -o remount,"${opts}" ${dev} $(where_is_mounted ${dev}) || panic "Remounting failed"
- mount -o bind $(where_is_mounted ${dev}) ${mountp} || panic "Cannot bind-mount"
+ mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+ mount -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
else
mount -t $(get_fstype "${dev}") -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}"
fi
--
debian-live
More information about the debian-live-changes
mailing list