From: Tom Jampen <tom@cryptography.ch>
Date: Mon, 15 Dec 2014 14:17:04 +0000 (+0100)
Subject: Adding command line parameter to remove persistence.
X-Git-Tag: debian/5.0_a3-1~12
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=73d837abfd95add4e0792ef27df8c7eea8a7388f

Adding command line parameter to remove persistence.
---

diff --git a/components/2010-remove-persistence b/components/2010-remove-persistence
new file mode 100755
index 0000000..5dcf0c0
--- /dev/null
+++ b/components/2010-remove-persistence
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+#set -e
+
+Remove_persistence ()
+{
+	for _PARAMETER in ${LIVE_BOOT_CMDLINE}
+	do
+		case "${_PARAMETER}" in
+			live-boot.persistence-remove=*|persistence-remove=*)
+				LIVE_PERSISTENCE_REMOVE="${_PARAMETER#*persistence-remove=}"
+				;;
+
+			live-boot.persistence-remove|persistence-remove)
+				LIVE_PERSISTENCE_REMOVE="true"
+				;;
+		esac
+	done
+
+	case "${LIVE_PERSISTENCE_REMOVE}" in
+		true)
+			;;
+
+		*)
+			return 0
+			;;
+	esac
+
+	# Remove persistence
+	cd /live/overlay && find . -not -name 'persistence.conf' | xargs rm -rf
+}
diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh
index 54b75e5..92d0355 100755
--- a/components/9990-overlay.sh
+++ b/components/9990-overlay.sh
@@ -299,6 +299,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}"