Defining PRESETS as a bash array is no longer supported.

PRESETS should be defined as a string in all mkinitcpio preset files
for compatibility with dash.

Signed-off-by: Loui Chang <louipc.ist@gmail.com>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>

2 files changed, 11 insertions, 2 deletions

diff --git a/mkinitcpio b/mkinitcpio
index e6beffb..1b40867 100755
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -116,14 +116,23 @@ shift $((${OPTIND} - 1))
 # use preset $PRESET
 if [ -n "${PRESET}" ]; then
     if [ -f "${PRESETDIR}/${PRESET}.preset" ]; then
+        echo "   -------------------------------------------------------------------"
+        echo "   WARNING: Defining PRESETS as a bash array is no longer supported."
+        echo "            PRESETS should be defined as a string in all mkinitcpio"
+        echo "            preset files for compatibility with dash."
+        echo "   -------------------------------------------------------------------"
+
         # Use -b, -m and -v options specified earlier
         PRESET_MKOPTS="${0}"
         [ -n "${BASEDIR}" ] && PRESET_MKOPTS="${PRESET_MKOPTS} -b ${BASEDIR}"
         [ -n "${MESSAGE}" ] && PRESET_MKOPTS="${PRESET_MKOPTS} -m \"${MESSAGE}\""
         [ "${QUIET}" = "n" ] && PRESET_MKOPTS="${PRESET_MKOPTS} -v"
+
         # Build all images
+        echo "==> Using ${PRESETDIR}/${PRESET}.preset"
         . ${PRESETDIR}/${PRESET}.preset
-        for p in ${PRESETS[@]}; do
+
+        for p in ${PRESETS}; do
             echo "==> Building image \"${p}\""
             PRESET_CMD="${PRESET_MKOPTS}"
 
diff --git a/mkinitcpio.d/example.preset b/mkinitcpio.d/example.preset
index 3fb32f1..9b9b32e 100644
--- a/mkinitcpio.d/example.preset
+++ b/mkinitcpio.d/example.preset
@@ -1,7 +1,7 @@
 # Example mkinitcpio preset file
 
 # preset names
-PRESETS=('default' 'fallback')
+PRESETS="default fallback"
 
 # ALL_kver is used if presetname_kver is not set
 # note for distribution kernels: this should be in a separate file