Merge branch 'feature-multiple-persistence-overlays' into 'master'

Accept multiple overlay names from persistence-label parameter See merge request live-team/live-boot!23
grml · Sep 12, 2019 · 71d0584 · 71d0584
2 parents b982538 + 4aa52e5
commit 71d0584
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/components/9990-cmdline-old b/components/9990-cmdline-old
@@ -200,7 +200,7 @@ Cmdline_old ()
 				;;
 
 			persistence-label=*)
-				custom_overlay_label="${_PARAMETER#persistence-label=*}"
+				custom_overlay_label=$(echo ${_PARAMETER#persistence-label=*} | sed -e 's/,/ /g')
 				;;
 
 			nopersistence)

diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh
@@ -195,12 +195,15 @@ setup_unionfs ()
 			do
 				media="$(echo ${media} | tr ":" " ")"
 
-				case ${media} in
-					${custom_overlay_label}=*)
-						device="${media#*=}"
-						overlay_devices="${overlay_devices} ${device}"
-						;;
-				 esac
+				for overlay_label in ${custom_overlay_label}
+				do
+					case ${media} in
+						${overlay_label}=*)
+							device="${media#*=}"
+							overlay_devices="${overlay_devices} ${device}"
+							;;
+					esac
+				done
 			done
 		fi
 	elif [ -n "${NFS_COW}" ] && [ -z "${NOPERSISTENCE}" ]