X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-overlay.sh;h=58828f66524acca9655bc788b29c344a1ad081c3;hb=396df49ea752a361a88ada9d180e3a58d9fa37a4;hp=54b75e50d4c887f7bb403e2507f758cb48926f16;hpb=f2dcec3f21086a557db86ae928295474be79d35b;p=live-boot-grml.git

diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh
index 54b75e5..58828f6 100755
--- a/components/9990-overlay.sh
+++ b/components/9990-overlay.sh
@@ -8,13 +8,13 @@ setup_unionfs ()
 	rootmnt="${2}"
 	addimage_directory="${3}"
 
+	modprobe -q -b ${UNIONTYPE}
+
 	if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$"
 	then
 		panic "${UNIONTYPE} not available."
 	fi
 
-	modprobe -q -b ${UNIONTYPE}
-
 	# run-init can't deal with images in a subdir, but we're going to
 	# move all of these away before it runs anyway.  No, we're not,
 	# put them in / since move-mounting them into / breaks mono and
@@ -117,6 +117,8 @@ setup_unionfs ()
 				log_begin_msg "Mounting \"${image}\" on \"${mpoint}\" via \"${backdev}\""
 				mount -t "${fstype}" -o ro,noatime "${backdev}" "${mpoint}" || panic "Can not mount ${backdev} (${image}) on ${mpoint}"
 				log_end_msg
+			else
+				log_warning_msg "Could not find image '${image}'. Most likely it is listed in a .module file, perhaps by mistake."
 			fi
 		done
 	else
@@ -299,6 +301,9 @@ setup_unionfs ()
 		fi || panic "mount ${UNIONTYPE} on ${unionmountpoint} failed with option ${unionmountopts}"
 	done
 
+	# Remove persistence depending on boot parameter
+	Remove_persistence
+
 	# Correct the permissions of /:
 	chmod 0755 "${rootmnt}"
 
@@ -352,8 +357,8 @@ setup_unionfs ()
 		done
 	fi
 
-        # ensure that a potentially stray tmpfs gets removed
-        # otherways, initramfs-tools is unable to remove /live
-        # and fails to boot
-        umount /live/overlay > /dev/null 2>&1 || true
+	# ensure that a potentially stray tmpfs gets removed
+	# otherways, initramfs-tools is unable to remove /live
+	# and fails to boot
+	umount /live/overlay > /dev/null 2>&1 || true
 }