Using boot.log and /var/log/live/boot.log respectively for overall consistency within...

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

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 9a80b11..1414156 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -736,13 +736,15 @@ try_mount ()
                        fstype=$(get_fstype "${dev}")
                fi
                mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || \
-               ( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > live-boot.log && return 0 )
+               ( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > boot.log && return 0 )
        fi
 }
 
 mount_persistence_media ()
 {
        local device=${1}
+       local probe=${2}
+
        local backing="/live/persistence/$(basename ${device})"
 
        mkdir -p "${backing}"
@@ -760,7 +762,8 @@ mount_persistence_media ()
                        echo ${backing}
                        return 0
                else
-                       log_warning_msg "Failed to mount persistence media ${device}"
+                       [ -z "${probe}" ] && log_warning_msg "Failed to mount persistence media ${device}"
+                       rmdir "${backing}"
                        return 1
                fi
        elif [ "${backing}" != "${old_backing}" ]
@@ -770,7 +773,8 @@ mount_persistence_media ()
                        echo ${backing}
                        return 0
                else
-                       log_warning_msg "Failed to move persistence media ${device}"
+                       [ -z "${probe}" ] && log_warning_msg "Failed to move persistence media ${device}"
+                       rmdir "${backing}"
                        return 1
                fi
        fi
@@ -906,7 +910,7 @@ probe_for_file_name ()
        local dev="${3}"
 
        local ret=""
-       local backing="$(mount_persistence_media ${dev})"
+       local backing="$(mount_persistence_media ${dev} probe)"
        if [ -z "${backing}" ]
        then
            return
@@ -969,7 +973,9 @@ find_persistence_media ()
        local white_listed_devices="${3}"
        local ret=""
 
-       for dev in $(storage_devices "" "${white_listed_devices}")
+       local black_listed_devices="$(what_is_mounted_on /live/image)"
+
+       for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}")
        do
                local result=""