Correcting debug variables through out the code to use the same one.

diff --git a/scripts/boot/0010-debug b/scripts/boot/0010-debug
index f223e93..9b57d56 100755 (executable)
--- a/scripts/boot/0010-debug
+++ b/scripts/boot/0010-debug
@@ -8,12 +8,12 @@ Debug ()
        do
                case "${_PARAMETER}" in
                        live-boot.debug|debug)
-                               LIVE_DEBUG="true"
+                               LIVE_BOOT_DEBUG="true"
                                ;;
                esac
        done
 
-       case "${LIVE_DEBUG}" in
+       case "${LIVE_BOOT_DEBUG}" in
                true)
                        ;;
 

diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh
index 5c5341c..82099a4 100755 (executable)
--- a/scripts/boot/9990-misc-helpers.sh
+++ b/scripts/boot/9990-misc-helpers.sh
@@ -1293,7 +1293,7 @@ get_custom_mounts ()
                        continue
                fi
 
-               if [ -n "${DEBUG}" ] && [ -e "${include_list}" ]
+               if [ -n "${LIVE_BOOT_DEBUG}" ] && [ -e "${include_list}" ]
                then
                        cp ${include_list} /live/persistence/${persistence_list}.${device_name}
                fi

diff --git a/scripts/boot/9990-mount-iscsi.sh b/scripts/boot/9990-mount-iscsi.sh
index 6ce9851..c9bab90 100755 (executable)
--- a/scripts/boot/9990-mount-iscsi.sh
+++ b/scripts/boot/9990-mount-iscsi.sh
@@ -9,7 +9,7 @@ do_iscsi()
        modprobe iscsi_tcp
        local debugopt
        debugopt=""
-       [ "${DEBUG}" = "true" ] && debugopt="-d 8"
+       [ "${LIVE_BOOT_DEBUG}" = "true" ] && debugopt="-d 8"
        #FIXME this name is supposed to be unique - some date + ifconfig hash?
        ISCSI_INITIATORNAME="iqn.1993-08.org.debian.live:01:$(echo "${HWADDR}" | sed -e s/://g)"
        export ISCSI_INITIATORNAME

diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh
index c6de171..6b62093 100755 (executable)
--- a/scripts/boot/9990-overlay.sh
+++ b/scripts/boot/9990-overlay.sh
@@ -381,7 +381,7 @@ setup_unionfs ()
                # Gather information about custom mounts from devies detected as overlays
                get_custom_mounts ${custom_mounts} ${overlay_devices}
 
-               [ -n "${DEBUG}" ] && cp ${custom_mounts} "/lib/live/mount/persistence"
+               [ -n "${LIVE_BOOT_DEBUG}" ] && cp ${custom_mounts} "/lib/live/mount/persistence"
 
                # Now we do the actual mounting (and symlinking)
                local used_overlays