From 0365023387052963c38c05a5c0334b111ba9b77e Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Wed, 9 Nov 2016 14:30:45 +0100
Subject: Make the name 'min' of the minimal package list customizable.

The 'min' package list contains the generic kernel.
This package list is special because the 'make_slackware_live.sh' script
will also take care of the ISO boot configuration while processing it.
A custom Live OS may want to use a custom filename instead of "min.lst",
so the variable $MINLIST was created for that purpose.
---
 README.txt               |  5 +++++
 make_slackware_live.conf | 11 ++++++++---
 make_slackware_live.sh   | 13 +++++++++----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/README.txt b/README.txt
index 243a40c..2c9fcfb 100644
--- a/README.txt
+++ b/README.txt
@@ -610,6 +610,11 @@ This is the section in ''make_slackware_live.conf'' which deals with these custo
 # respectively):
 #SEQ_CUSTOM="min,xbase,xapbase,xfcebase,cinelerra"
 
+# OPTIONAL:
+# Use something else than the name "min",
+# for the package list containing the generic kernel:
+#MINLIST="min"
+
 # OPTIONAL:
 # Your custom distro name (will reflect in boot screen & filenames):
 #DISTRO="cinelerra"
diff --git a/make_slackware_live.conf b/make_slackware_live.conf
index 53f3834..6fec3e6 100644
--- a/make_slackware_live.conf
+++ b/make_slackware_live.conf
@@ -47,9 +47,9 @@
 # Directory where the live ISO image will be written:
 #OUTPUT="/tmp"
 
-#
-# -- This is how you can create your own custom Live OS:
-#
+# --------------------------------------------------------- #
+# -- This is how you can create your own custom Live OS: -- #
+# --------------------------------------------------------- #
 
 # REQUIRED:
 # Define a new name for your own variant of Slackware Live Edition:
@@ -62,6 +62,11 @@
 # respectively):
 #SEQ_CUSTOM="min,xbase,xapbase,xfcebase,cinelerra"
 
+# OPTIONAL:
+# Use something else than the name "min",
+# for the package list containing the generic kernel:
+#MINLIST="min"
+
 # OPTIONAL:
 # Your custom distro name (will reflect in boot screen & filenames):
 #DISTRO="cinelerra"
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 388714f..3c51ed1 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -132,6 +132,11 @@ MARKER=${MARKER:-"SLACKWARELIVE"}
 # The filesystem label we will be giving our ISO:
 MEDIALABEL=${MEDIALABEL:-"LIVESLAK"}
 
+# The name of the custom package list containing the generic kernel.
+# This package list is special because the script will also take care of
+# the ISO boot setup when processing the MINLIST package list:
+MINLIST=${MINLIST:-"min"}
+
 # For x86_64 you can add multilib:
 MULTILIB=${MULTILIB:-"NO"}
 
@@ -159,11 +164,11 @@ SEQ_SLACKWARE="tagfile:a,ap,d,e,f,k,kde,kdei,l,n,t,tcl,x,xap,xfce,y pkglist:slac
 
 # Stripped-down Slackware with XFCE as the Desktop Environment:
 # - each series will become a squashfs module:
-SEQ_XFCEBASE="min,xbase,xapbase,xfcebase"
+SEQ_XFCEBASE="${MINLIST},xbase,xapbase,xfcebase"
 
 # Stripped-down Slackware with KDE4 as the Desktop Environment:
 # - each series will become a squashfs module:
-SEQ_KDE4BASE="pkglist:min,xbase,xapbase,kde4base"
+SEQ_KDE4BASE="pkglist:${MINLIST},xbase,xapbase,kde4base"
 
 # List of Slackware package series with Plasma5 instead of KDE 4 (full install):
 # - each will become a squashfs module:
@@ -994,7 +999,7 @@ for SPS in ${SL_SERIES} ; do
     install_pkgs ${SPS} ${LIVE_ROOTDIR} ${MTYPE}
     umount ${LIVE_ROOTDIR} || true
 
-    if [ "$SPS" = "a" -o "$SPS" = "min" ]; then
+    if [ "$SPS" = "a" -o "$SPS" = "${MINLIST}" ]; then
 
       # We need to take care of a few things first:
       if [ "$SL_ARCH" = "x86_64" -o "$SMP32" = "NO" ]; then
@@ -1025,7 +1030,7 @@ for SPS in ${SL_SERIES} ; do
     # End result: we have our .sxz file and the INSTDIR is empty again,
     # Next step is to loop-mount the squashfs file onto INSTDIR.
 
-  elif [ "$SPS" = "a" -o "$SPS" = "min" ]; then
+  elif [ "$SPS" = "a" -o "$SPS" = "${MINLIST}" ]; then
 
     # We need to do a bit more if we skipped creation of 'a' or 'min' module:
     # Extract the content of the /boot directory out of the boot module,
-- 
cgit v1.2.3