Handle list arguments better in get_custom_mounts().

diff --git a/scripts/live b/scripts/live
index 3a1eb60..a24da07 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -1223,7 +1223,7 @@ setup_unionfs ()
                rm -rf ${custom_mounts} 2> /dev/null
 
                # Gather information about custom mounts from devies detected as overlays
-               get_custom_mounts ${overlay_devices} ${custom_mounts}
+               get_custom_mounts ${custom_mounts} ${overlay_devices}
 
                [ -n "${DEBUG}" ] && cp ${custom_mounts} "${rootmnt}/live/persistent"
 

diff --git a/scripts/live-helpers b/scripts/live-helpers
index e612092..243256a 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -1228,8 +1228,9 @@ get_custom_mounts ()
        # Side-effect: leaves $devices with live.persist mounted in ${rootmnt}/live/persistent
        # Side-effect: prints info to file $custom_mounts
 
-       local devices="${1}"
-       local custom_mounts="${2}" # print result to this file
+       local custom_mounts=${1}
+       shift
+       local devices=${@}
 
        local bindings="/tmp/bindings.list"
        local links="/tmp/links.list"