Ignore errors from fstype.

[live-boot-grml.git] / scripts / live-helpers

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 70c7f34..990c088 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -77,7 +77,7 @@ get_fstype ()
            return
        fi
 
-       eval $(fstype < ${1})
+       eval $(fstype < ${1} 2>/dev/null)
 
        if [ "${FSTYPE}" != "unknown" ]
        then
@@ -146,7 +146,7 @@ fs_size ()
                        mountp="/mnt/tmp_fs_size"
 
                        mkdir -p "${mountp}"
-                       mount -n -t $(get_fstype "${dev}") -o ro "${dev}" "${mountp}"
+                       mount -t $(get_fstype "${dev}") -o ro "${dev}" "${mountp}"
 
                        doumount=1
                fi
@@ -274,10 +274,10 @@ try_mount ()
 
        if [ -n "${old_mountp}" ]
        then
-               mount -n -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
-               mount -n -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
+               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 -n -t $(get_fstype "${dev}") -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}"
+               mount -t $(get_fstype "${dev}") -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}"
        fi
 }