From e103f0de308539e2bd0f53845d365e45fdf60ebc Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sun, 26 Aug 2018 11:52:55 +0200
Subject: Rename some variables in anticipation of adding zstd compression
 support

---
 make_slackware_live.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'make_slackware_live.sh')

diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 877c2ca..851af44 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -229,15 +229,15 @@ COMPR=${COMPR:-"xz --check=crc32"}
 
 # What compression to use for the squashfs modules?
 # Default is xz, alternatives are gzip, lzma, lzo:
-SXZ_COMP=${SXZ_COMP:-"xz"}
+SQ_COMP=${SQ_COMP:-"xz"}
 
 # What compression parameters to use?
 # For our lean XFCE image we try to achieve max compression,
 # at the expense of runtime latency:
 if [ "$LIVEDE" = "XFCE" ] ; then
-  SXZ_COMP_PARAMS=${SXZ_COMP_PARAMS:-"-b 1M"}
+  SQ_COMP_PARAMS=${SQ_COMP_PARAMS:-"-b 1M"}
 else
-  SXZ_COMP_PARAMS=${SXZ_COMP_PARAMS:-"-b 512k -Xdict-size 100%"}
+  SQ_COMP_PARAMS=${SQ_COMP_PARAMS:-"-b 512k -Xdict-size 100%"}
 fi
 
 # Mount point where Live filesystem is assembled (no storage requirements):
@@ -1147,13 +1147,13 @@ for SPS in ${SL_SERIES} ; do
         rm -rf ${LIVE_BOOT}/boot
         mv ${INSTDIR}/boot ${LIVE_BOOT}/
         # Squash the boot files into a module as a safeguard:
-        mksquashfs ${LIVE_BOOT} ${LIVE_MOD_SYS}/0000-${DISTRO}_boot-${SL_VERSION}-${SL_ARCH}.sxz -noappend -comp ${SXZ_COMP} -b 1M
+        mksquashfs ${LIVE_BOOT} ${LIVE_MOD_SYS}/0000-${DISTRO}_boot-${SL_VERSION}-${SL_ARCH}.sxz -noappend -comp ${SQ_COMP} -b 1M
       fi
 
     fi
 
     # Squash the installed package series into a module:
-    mksquashfs ${INSTDIR} ${LIVE_MOD_SYS}/${MNUM}-${DISTRO}_${SPS}-${SL_VERSION}-${SL_ARCH}.sxz -noappend -comp ${SXZ_COMP} -b 1M
+    mksquashfs ${INSTDIR} ${LIVE_MOD_SYS}/${MNUM}-${DISTRO}_${SPS}-${SL_VERSION}-${SL_ARCH}.sxz -noappend -comp ${SQ_COMP} -b 1M
     rm -rf ${INSTDIR}/*
 
     # End result: we have our .sxz file and the INSTDIR is empty again,
@@ -2191,7 +2191,7 @@ chroot ${LIVE_ROOTDIR} /etc/cron.daily/${LOCATE_BIN} 2>${DBGOUT}
 
 # Squash the configuration into its own module:
 umount ${LIVE_ROOTDIR} 2>${DBGOUT} || true
-mksquashfs ${INSTDIR} ${LIVE_MOD_SYS}/0099-${DISTRO}_zzzconf-${SL_VERSION}-${SL_ARCH}.sxz -noappend -comp ${SXZ_COMP} -b 1M
+mksquashfs ${INSTDIR} ${LIVE_MOD_SYS}/0099-${DISTRO}_zzzconf-${SL_VERSION}-${SL_ARCH}.sxz -noappend -comp ${SQ_COMP} -b 1M
 rm -rf ${INSTDIR}/*
 
 # End result: we have our .sxz file and the INSTDIR is empty again,
@@ -2318,7 +2318,7 @@ cp -a ${LIVE_BOOT}/boot/vmlinuz-generic*-$KGEN ${LIVE_STAGING}/boot/generic
 mv ${LIVE_BOOT}/boot/initrd_${KVER}.img ${LIVE_STAGING}/boot/initrd.img
 
 # Squash the boot directory into its own module:
-mksquashfs ${LIVE_BOOT} ${LIVE_MOD_SYS}/0000-${DISTRO}_boot-${SL_VERSION}-${SL_ARCH}.sxz -noappend -comp ${SXZ_COMP} -b 1M
+mksquashfs ${LIVE_BOOT} ${LIVE_MOD_SYS}/0000-${DISTRO}_boot-${SL_VERSION}-${SL_ARCH}.sxz -noappend -comp ${SQ_COMP} -b 1M
 
 # Determine additional boot parameters to be added:
 if [ -z ${KAPPEND} ]; then
-- 
cgit v1.2.3