diff options
| author | Tails developers <amnesia@boum.org> | 2012-02-24 14:41:30 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-04-05 07:47:30 +0200 |
| commit | 5ca613caa8948bb2686b592880f45caaa61e4662 (patch) | |
| tree | e81a7cae0461c4f2da400125eccb27e4695eca6e /scripts | |
| parent | 57f78bf4a7fd838d47addc7feff5cf22550bc240 (diff) | |
| download | live-boot-5ca613caa8948bb2686b592880f45caaa61e4662.tar.gz live-boot-5ca613caa8948bb2686b592880f45caaa61e4662.zip | |
Handle list arguments better in get_custom_mounts().
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live | 2 | ||||
| -rw-r--r-- | scripts/live-helpers | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scripts/live b/scripts/live index 3a1eb60..a24da07 100755 --- 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 --- 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" |