From 47433e5a60cd74da9d3abca82febfd4f84157619 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Thu, 24 Dec 2015 18:00:18 +0100
Subject: Stamp a VERSION number in the ISO, and to the USB partition.

---
 iso2usb.sh             |  8 +++++++-
 make_slackware_live.sh | 20 +++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/iso2usb.sh b/iso2usb.sh
index fe06678..d791c98 100644
--- a/iso2usb.sh
+++ b/iso2usb.sh
@@ -147,7 +147,7 @@ fi
 
 # Are all the required not-so-common add-on tools present?
 PROG_MISSING=""
-for PROGN in blkid cpio extlinux fdisk gdisk mkdosfs sgdisk ; do
+for PROGN in blkid cpio extlinux fdisk gdisk iso-info mkdosfs sgdisk ; do
   if ! PATH="/sbin:$PATH" which $PROGN 1>/dev/null 2>/dev/null ; then
     PROG_MISSING="${PROG_MISSING}--   $PROGN\n"
   fi
@@ -267,6 +267,12 @@ cp ${EFIMNT}/EFI/BOOT/bootx64.efi ${USBMNT}/EFI/BOOT
 echo "--- Copying files from ISO to USB... takes some time."
 rsync -a ${RVERBOSE} ${ISOMNT}/* ${USBMNT}/
 
+# Write down the version of the ISO image:
+VERSION=$(iso-info ${SLISO} |grep Application |cut -d: -f2- 2>/dev/null)
+if [ -n "$VERSION" ]; then
+  echo "$VERSION" > ${USBMNT}/.isoversion
+fi
+
 # Create a temporary extraction directory for the initrd:
 mkdir -p /mnt
 IMGDIR=$(mktemp -d -p /mnt -t alienimg.XXXXXX)
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 72b43e8..e43e23a 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -25,14 +25,18 @@
 #
 # This script creates a live image for a Slackware OS.
 # Features:
-# - boots using isolinux/extlinux
+# - boots using isolinux/extlinux on BIOS, or grub on UEFI.
 # - requires kernel >= 4.0 which supports multiple lower layers in overlay
 # - uses squashfs to create compressed modules out of directory trees
 # - uses overlayfs to bind multiple squashfs modules together
-# - you can add your own modules into ./addons/ subdirectory
+# - you can add your own modules into ./addons/ or ./optional subdirectories.
+# - persistence is enabled when writing the ISO to USB stick using iso2usb.sh.
 #
 # -----------------------------------------------------------------------------
 
+# Version of the Live OS generator:
+VERSION="Beta3"
+
 # Directory where our live tools are stored:
 LIVE_TOOLDIR=${LIVE_TOOLDIR:-"$(cd $(dirname $0); pwd)"}
 
@@ -141,7 +145,7 @@ SEQ_KDE4BASE="pkglist:min,xbase,xapbase,kde4base"
 
 # List of Slackware package series with Plasma5 instead of KDE 4 (full install):
 # - each will become a squashfs module:
-SEQ_PLASMA5="tagfile:a,ap,d,e,f,k,l,n,t,tcl,x,xap,xfce,y pkglist:slackextra,kde4plasma5,plasma5 local:slackpkg+"
+SEQ_PLASMA5="tagfile:a,ap,d,e,f,k,l,n,t,tcl,x,xap,xfce,y pkglist:slackextra,kde4plasma5,plasma5,alien local:slackpkg+"
 
 # List of Slackware package series with MSB instead of KDE 4 (full install):
 # - each will become a squashfs module:
@@ -1305,9 +1309,9 @@ mkisofs -o ${OUTPUT}/slackware${DIRSUFFIX}-live${ISOTAG}-${SL_VERSION}.iso \
   -c boot/syslinux/isolinux.boot \
   -eltorito-alt-boot -no-emul-boot -eltorito-platform 0xEF \
   -eltorito-boot boot/syslinux/efiboot.img \
-  -preparer "Built for Slackware${DIRSUFFIX}-Live by ${BUILDER}" \
+  -preparer "$(echo $LIVEDE |sed 's/BASE//') Live built by ${BUILDER}" \
   -publisher "The Slackware Linux Project - http://www.slackware.com/" \
-  -A "Slackware Live ${SL_VERSION} for ${ARCH}" \
+  -A "Slackware Live ${SL_VERSION} for ${SL_ARCH} ($VERSION)" \
   -V "${MEDIALABEL}" \
   -x ./$(basename ${LIVE_WORK}) \
   -x ./${LIVEMAIN}/bootinst \
@@ -1338,8 +1342,10 @@ else
   fi
   isohybrid -s $SECTORS -h $HEADS -u ${OUTPUT}/slackware${DIRSUFFIX}-live${ISOTAG}-${SL_VERSION}.iso
 fi
-md5sum ${OUTPUT}/slackware${DIRSUFFIX}-live${ISOTAG}-${SL_VERSION}.iso \
-  > ${OUTPUT}/slackware${DIRSUFFIX}-live${ISOTAG}-${SL_VERSION}.iso.md5
+cd ${OUTPUT}
+  md5sum slackware${DIRSUFFIX}-live${ISOTAG}-${SL_VERSION}.iso \
+    > slackware${DIRSUFFIX}-live${ISOTAG}-${SL_VERSION}.iso.md5
+cd - 1>/dev/null
 echo "-- Live ISO image created:"
 ls -l ${OUTPUT}/slackware${DIRSUFFIX}-live${ISOTAG}-${SL_VERSION}.iso*
 
-- 
cgit v1.2.3