diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/live-helpers | 19 |
1 files changed, 9 insertions, 10 deletions
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 |