From 4aa52e5c51cc7401c3fec7feaad54ac08c484049 Mon Sep 17 00:00:00 2001 From: Marcel Partap Date: Mon, 9 Sep 2019 16:10:42 +0200 Subject: [PATCH] Accept multiple overlay names from persistence-label parameter .. separated by ',' as in persistence-label=linux-userdata,linux-systemconfig.img --- components/9990-cmdline-old | 2 +- components/9990-overlay.sh | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/components/9990-cmdline-old b/components/9990-cmdline-old index 03e8fc6..6e9082d 100755 --- 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 index 61b1f26..eb57d4d 100755 --- 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}" ] -- 2.1.4