Added a pretty vital mount debug string.

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

diff --git a/scripts/live b/scripts/live
index caaf45b..418a854 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -285,9 +285,9 @@ Arguments ()
                                export NOSUDO
                                ;;
 
-                       noswap)
-                               NOSWAP="Yes"
-                               export NOSWAP
+                       swapon)
+                               SWAPON="Yes"
+                               export SWAPON
                                ;;
 
                        noupdatenotifier)
@@ -538,7 +538,7 @@ mount_images_in_directory ()
 {
        directory="${1}"
        rootmnt="${2}"
-       mac="${3}"
+       mac="${3}"
 
 
        if match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.squashfs" ||
@@ -621,14 +621,14 @@ copy_live_to ()
        # begin copying (or uncompressing)
        mkdir "${copyto}"
        echo "mount -t ${fstype} ${mount_options} ${dev} ${copyto}"
-       mount -t "${fstype}" ${mount_options} "${dev}" "${copyto}"
+       mount -n -t "${fstype}" ${mount_options} "${dev}" "${copyto}"
 
        if [ "${extension}" = "tgz" ]
        then
                cd "${copyto}"
                tar zxf "${copyfrom}/${LIVE_MEDIA_PATH}/$(basename ${FETCH})"
                rm -f "${copyfrom}/${LIVE_MEDIA_PATH}/$(basename ${FETCH})"
-               mount -r -o move "${copyto}" "${rootmnt}"
+               mount -n -r -o move "${copyto}" "${rootmnt}"
                cd "${OLDPWD}"
        else
                if [ -n "${MODULETORAMFILE}" ]
@@ -640,7 +640,7 @@ copy_live_to ()
 
                livefs_root
                umount ${copyfrom}
-               mount -r -o move ${copyto} ${copyfrom}
+               mount -n -r -o move ${copyto} ${copyfrom}
        fi
 
        rmdir ${copyto}
@@ -708,7 +708,7 @@ do_httpmount ()
 {
        rc=1
        dest="${mountpoint}/${LIVE_MEDIA_PATH}"
-       mount -t ramfs ram "${mountpoint}"
+       mount -n -t ramfs ram "${mountpoint}"
        mkdir -p "${dest}"
 
        for webfile in HTTPFS FTPFS FETCH
@@ -844,7 +844,7 @@ do_snap_copy ()
                if [ -n "${fstype}" ]
                then
                        # Copying stuff...
-                       mount -t "${fstype}" -o ro,noatime "${fromdev}" "${tomount}"
+                       mount -n -t "${fstype}" -o ro,noatime "${fromdev}" "${tomount}" || log_warning_msg "Error in mount -n -t ${fstype} -o ro,noatime ${fromdev} ${tomount}"
                        cp -a "${tomount}"/* ${todir}
                        umount "${tomount}"
                else
@@ -1040,9 +1040,15 @@ setup_unionfs ()
                                panic "Unknown file system type on ${backdev} (${image})"
                        fi
 
+                       if [ -z "${fstype}" ]
+                       then
+                               fstype="${imagename##*.}"
+                               log_warning_msg "Unknown file system type on ${backdev} (${image}), assuming ${fstype}."
+                       fi
+
                        mkdir -p "${croot}/${imagename}"
                        log_begin_msg "Mounting \"${image}\" on \"${croot}${imagename}\" via \"${backdev}\""
-                       mount -t "${fstype}" -o ro,noatime "${backdev}" "${croot}/${imagename}" || panic "Can not mount ${backdev} (${image}) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}"
+                       mount -n -t "${fstype}" -o ro,noatime "${backdev}" "${croot}/${imagename}" || panic "Can not mount ${backdev} (${image}) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}"
                        log_end_msg
                fi
        done
@@ -1131,7 +1137,7 @@ setup_unionfs ()
                nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
                        panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
        else
-               mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || \
+               mount -n -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || \
                        panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
        fi
 
@@ -1145,7 +1151,7 @@ setup_unionfs ()
                fi
                exposedrootfs=${rofslist%% }
 
-               mount --bind ${exposedrootfs} ${rootmnt} || \
+               mount -n --bind ${exposedrootfs} ${rootmnt} || \
                        panic "bind mount of ${exposedrootfs} failed"
 
                cow_dirs='/var/tmp /var/lock /var/run /var/log /var/spool
@@ -1153,14 +1159,14 @@ setup_unionfs ()
 
                for dir in ${cow_dirs}; do
                        mkdir -p /cow${dir}
-                       mount -t ${UNIONTYPE} \
+                       mount -n -t ${UNIONTYPE} \
                                -o rw,noatime,dirs=/cow${dir}=rw:${exposedrootfs}${dir}=ro \
                                ${UNIONTYPE} "${rootmnt}${dir}" || \
                                panic "mount ${UNIONTYPE} on ${rootmnt}${dir} failed with option \
                                        rw,noatime,dirs=/cow${dir}=rw:${exposedrootfs}${dir}=ro"
                done
        else
-               mount -t ${UNIONTYPE} -o noatime,dirs=/cow=rw:${rofsstring} \
+               mount -n -t ${UNIONTYPE} -o noatime,dirs=/cow=rw:${rofsstring} \
                        ${UNIONTYPE} "${rootmnt}" || panic "mount ${UNIONTYPE} on \
                        ${rootmnt} failed with option noatime,dirs=/cow=rw:${rofsstring}"
        fi
@@ -1168,7 +1174,7 @@ setup_unionfs ()
        # tmpfs file systems
        touch /etc/fstab
        mkdir -p "${rootmnt}/live"
-       mount -t tmpfs tmpfs ${rootmnt}/live
+       mount -n -t tmpfs tmpfs ${rootmnt}/live
 
        # Adding other custom mounts
        if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ]
@@ -1179,7 +1185,7 @@ setup_unionfs ()
 
                if [ -b "${homecow}" ]
                then
-                       mount -t $(get_fstype "${homecow}") -o rw,noatime "${homecow}" "${rootmnt}/home"
+                       mount -n -t $(get_fstype "${homecow}") -o rw,noatime "${homecow}" "${rootmnt}/home"
                        export HOMEMOUNTED=1 # used to proper calculate free space in do_snap_copy()
                else
                        log_warning_msg "Unable to find the persistent home medium"
@@ -1202,7 +1208,7 @@ setup_unionfs ()
                                        ;;
 
                                *)
-                                       mount -o move "${d}" "${rootmnt}/live/${d##*/}"
+                                       mount -n -o move "${d}" "${rootmnt}/live/${d##*/}"
                                        ;;
                        esac
                done
@@ -1210,7 +1216,7 @@ setup_unionfs ()
 
        # shows cow fs on /cow for use by live-snapshot
        mkdir -p "${rootmnt}/live/cow"
-       mount -o move /cow "${rootmnt}/live/cow" >/dev/null 2>&1 || mount -o bind /cow "${rootmnt}/live/cow" || log_warning_msg "Unable to move or bind /cow to ${rootmnt}/live/cow"
+       mount -n -o move /cow "${rootmnt}/live/cow" >/dev/null 2>&1 || mount -n -o bind /cow "${rootmnt}/live/cow" || log_warning_msg "Unable to move or bind /cow to ${rootmnt}/live/cow"
 }
 
 check_dev ()
@@ -1226,7 +1232,7 @@ check_dev ()
 
        if [ -d "${devname}" ]
        then
-               mount -o bind "${devname}" $mountpoint || continue
+               mount -n -o bind "${devname}" $mountpoint || continue
 
                if is_live_path $mountpoint
                then
@@ -1247,7 +1253,7 @@ check_dev ()
 
        if is_supported_fs ${fstype}
        then
-               mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
+               mount -n -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
 
                if is_live_path ${mountpoint} && \
                        ([ "${skip_uuid_check}" ] || matches_uuid ${mountpoint})
@@ -1332,12 +1338,13 @@ set_usplash_timeout ()
        if [ -x /sbin/usplash_write ]
        then
                /sbin/usplash_write "TIMEOUT 120"
-       fi
+       else if [ -x /sbin/splashy_update ] ; then
+               /sbin/splashy_update "TIMEOUT 120"
+       fi ; fi
 }
 
 mountroot ()
 {
-    
         if [ -x /scripts/local-top/cryptroot ]; then
            /scripts/local-top/cryptroot
        fi
@@ -1350,7 +1357,7 @@ mountroot ()
        tailpid="${!}"
 
        # Ensure 'panic' function is overridden
-       . /scripts/live-functions
+       . /scripts/live-functions
 
        Arguments