X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot%2F9990-overlay.sh;h=dba042bb294f4adfcd615e1f744bd37c0f08ae9a;hb=f980faf163f7e54f80a5885ae6719f8a053e03c3;hp=96c3331ddd3f7965de44c52e1773472061b9ce7c;hpb=2f02d72b1816c4d8b59c10c56bd747f8f01e4d1e;p=live-boot-grml.git

diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh
index 96c3331..dba042b 100755
--- a/scripts/boot/9990-overlay.sh
+++ b/scripts/boot/9990-overlay.sh
@@ -189,7 +189,8 @@ setup_unionfs ()
 			done
 		fi
 
-		local whitelistdev=""
+		local whitelistdev
+		whitelistdev=""
 		if [ -n "${PERSISTENCE_MEDIA}" ]
 		then
 			case "${PERSISTENCE_MEDIA}" in
@@ -212,7 +213,8 @@ setup_unionfs ()
 			overlays="${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label}"
 		fi
 
-		local overlay_devices=""
+		local overlay_devices
+		overlay_devices=""
 		if [ "${whitelistdev}" != "ignore_all_devices" ]
 		then
 			for media in $(find_persistence_media "${overlays}" "${whitelistdev}")
@@ -333,7 +335,8 @@ setup_unionfs ()
 		then
 			# FIXME: handle PERSISTENCE_READONLY
 			unionmountopts="-t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice}"
-			mount_full $unionmountopts "${unionmountpoint}"
+			# unionmount only works with util-linux mount
+			mount.util-linux $unionmountopts "${unionmountpoint}"
 		else
 			cow_dir="/live/overlay${dir}"
 			rootfs_dir="${rootfs}${dir}"
@@ -406,7 +409,8 @@ setup_unionfs ()
 	# Adding custom persistence
 	if [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ]
 	then
-		local custom_mounts="/tmp/custom_mounts.list"
+		local custom_mounts
+		custom_mounts="/tmp/custom_mounts.list"
 		rm -rf ${custom_mounts} 2> /dev/null
 
 		# Gather information about custom mounts from devies detected as overlays
@@ -415,7 +419,8 @@ setup_unionfs ()
 		[ -n "${DEBUG}" ] && cp ${custom_mounts} "/lib/live/mount/persistence"
 
 		# Now we do the actual mounting (and symlinking)
-		local used_overlays=""
+		local used_overlays
+		used_overlays=""
 		used_overlays=$(activate_custom_mounts ${custom_mounts})
 		rm ${custom_mounts}