Included more debug and comments on persistence code.

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

diff --git a/scripts/live b/scripts/live
index 7bd673b..f9e4fe2 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -21,6 +21,17 @@ HOSTNAME="host"
 
 mkdir -p "${mountpoint}"
 
+# Create /etc/mtab for debug purpose and future syncs
+if [ ! -d /etc ]
+then
+       mkdir /etc/
+fi
+
+if [ ! -f /etc/mtab ]
+then
+       touch /etc/mtab
+fi
+
 [ -f /etc/live.conf ] && . /etc/live.conf
 export USERNAME USERFULLNAME HOSTNAME
 
@@ -285,9 +296,9 @@ Arguments ()
                                export NOSUDO
                                ;;
 
-                       noswap)
-                               NOSWAP="Yes"
-                               export NOSWAP
+                       swapon)
+                               SWAPON="Yes"
+                               export SWAPON
                                ;;
 
                        noupdatenotifier)
@@ -333,9 +344,9 @@ Arguments ()
                        url=*)
                                location="${ARGUMENT#url=}"
 
-                               mount -n -o bind /sys /root/sys
-                               mount -n -o bind /proc /root/proc
-                               mount -n -o bind /dev /root/dev
+                               mount -o bind /sys /root/sys
+                               mount -o bind /proc /root/proc
+                               mount -o bind /dev /root/dev
 
                                mkdir -p /root/var/run/network
                                chroot /root dhclient eth0
@@ -538,7 +549,7 @@ mount_images_in_directory ()
 {
        directory="${1}"
        rootmnt="${2}"
-       mac="${3}"
+       mac="${3}"
 
 
        if match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.squashfs" ||
@@ -844,7 +855,7 @@ do_snap_copy ()
                if [ -n "${fstype}" ]
                then
                        # Copying stuff...
-                       mount -t "${fstype}" -o ro,noatime "${fromdev}" "${tomount}"
+                       mount -t "${fstype}" -o ro,noatime "${fromdev}" "${tomount}" || log_warning_msg "Error in mount -t ${fstype} -o ro,noatime ${fromdev} ${tomount}"
                        cp -a "${tomount}"/* ${todir}
                        umount "${tomount}"
                else
@@ -878,35 +889,46 @@ try_snap ()
 
        if [ ! -z "${snapdata}" ]
        then
+               log_success_msg "found snapshot: ${snapdata}"
                snapdev="$(echo ${snapdata} | cut -f1 -d ' ')"
                snapback="$(echo ${snapdata} | cut -f2 -d ' ')"
                snapfile="$(echo ${snapdata} | cut -f3 -d ' ')"
 
+               RES=""
+
                if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\|jffs2\)'
                then
                        # squashfs, jffs2 or ext2/ext3 snapshot
                        dev=$(get_backing_device "${snapback}/${snapfile}")
 
-                       if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}"
-                       then
-                               log_warning_msg "Impossible to include the ${snapfile} Snapshot"
-                               return 1
-                       fi
+                       do_snap_copy "${dev}" "${snap_mount}" "${snap_type}"
+                       RES=$?
                else
                        # cpio.gz snapshot
-                       if ! (cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | cpio --extract --preserve-modification-time --no-absolute-filenames --sparse --unconditional --make-directories > /dev/null 2>&1)
+                       cd "${snap_mount}"
+                       zcat "${snapback}/${snapfile}" | /bin/cpio --extract --preserve-modification-time --no-absolute-filenames --sparse --unconditional --make-directories > /dev/null 2>&1
+                       RES=$?
+                       if [ "${RES}" != "0" ]
                        then
-                               log_warning_msg "Impossible to include the ${snapfile} Snapshot"
-                               return 1
+                               log_warning_msg "failure to \"zcat ${snapback}/${snapfile} | /bin/cpio --extract --preserve-modification-time --no-absolute-filenames --sparse --unconditional --make-directories\""
                        fi
+                       cd "${OLDPWD}"
+               fi
+
+               umount "${snapback}" ||  log_warning_msg "failure to \"umount ${snapback}\""
+
+               if [ "${RES}" != "0" ]
+               then
+                       log_warning_msg "Impossible to include the ${snapfile} Snapshot file"
                fi
 
-               umount "${snapback}"
        else
+               # Try to find if it could be a snapshot partition
                dev=$(find_cow_device "${snap_label}")
 
-               if [ -b ${dev} ]
+               if [ -b "${dev}" ]
                then
+                       log_success_msg "found snapshot device on ${dev}"
                        if echo "${dev}" | grep -qs loop
                        then
                                # strange things happens, user confused?
@@ -1040,6 +1062,12 @@ 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}"
@@ -1210,7 +1238,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" || mount -o bind /cow "${rootmnt}/live/cow" || log_warning_msg "Unable to move or bind /cow to ${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"
 }
 
 check_dev ()
@@ -1332,12 +1360,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,11 +1379,13 @@ mountroot ()
        tailpid="${!}"
 
        # Ensure 'panic' function is overridden
-       . /scripts/live-functions
+       . /scripts/live-functions
 
        Arguments
 
        set_usplash_timeout
+
+       maybe_break live-premount
        log_begin_msg "Running /scripts/live-premount"
        run_scripts /scripts/live-premount
        log_end_msg