summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-01-22 14:29:01 +0100
committer Eric Hameleers <alien@slackware.com>2016-01-22 14:29:01 +0100
commit9750f68884ca5a443aaa15806448eab065a1b42f (patch)
tree4369d6a9eec6460d41237f12470fe9dee273962b
parent9ef1e6f607ae447d2eead4ca196e303b43cc405b (diff)
downloadliveslak-9750f68884ca5a443aaa15806448eab065a1b42f.tar.gz
liveslak-9750f68884ca5a443aaa15806448eab065a1b42f.tar.xz
Readability changes to various comments in the script.
-rwxr-xr-xmake_slackware_live.sh13
1 files changed, 7 insertions, 6 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 7b13f70..561210a 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -162,16 +162,17 @@ KMODS=${KMODS:-"squashfs:overlay:loop:xhci-pci:ehci-pci:uhci_hcd:usb-storage:hid
# Default is xz, alternatives are gzip, lzma, lzo:
SXZ_COMP=${SXZ_COMP:-"xz"}
-# Mount point where we will assemble a Slackware filesystem:
+# Mount point where Live filesystem is assembled (no storage requirements):
LIVE_ROOTDIR=${LIVE_ROOTDIR:-"/mnt/slackwarelive"}
-# Toplevel directory of our staging area:
+# Toplevel directory of our staging area (this needs sufficient storage):
LIVE_STAGING=${LIVE_STAGING:-"/tmp/slackwarelive_staging"}
# Work directory where we will create all the temporary stuff:
LIVE_WORK=${LIVE_WORK:-"${LIVE_STAGING}/temp"}
-# Directory to be used by overlayfs for data manipulation:
+# Directory to be used by overlayfs for data manipulation,
+# needs to be a directory in the same filesystem as ${LIVE_WORK}:
LIVE_OVLDIR=${LIVE_OVLDIR:-"${LIVE_WORK}/.ovlwork"}
# Directory where we will move the kernel and create the initrd;
@@ -866,10 +867,10 @@ EOT
# Reduce the number of local consoles, two should be enough:
sed -i -e '/^c3\|^c4\|^c5\|^c6/s/^/# /' ${LIVE_ROOTDIR}/etc/inittab
-# Prevent loop devices (xzm modules) from appearing in filemanagers:
+# Prevent loop devices (sxz modules) from appearing in filemanagers:
mkdir -p ${LIVE_ROOTDIR}/etc/udev/rules.d
cat <<EOL > ${LIVE_ROOTDIR}/etc/udev/rules.d/11-local.rules
-# Prevent loop devices (mounted xzm modules) from appearing in
+# Prevent loop devices (mounted sxz modules) from appearing in
# filemanager panels - http://www.seguridadwireless.net
# Hidden loops for udisks:
@@ -1463,7 +1464,7 @@ mkisofs -o ${OUTPUT}/slackware${DIRSUFFIX}-live${ISOTAG}-${SL_VERSION}.iso \
-eltorito-boot boot/syslinux/efiboot.img \
-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 ${SL_ARCH} ($VERSION)" \
+ -A "Slackware-${SL_VERSION} for ${SL_ARCH} ($(echo $LIVEDE |sed 's/BASE//') Live $VERSION)" \
-V "${MEDIALABEL}" \
-x ./$(basename ${LIVE_WORK}) \
-x ./${LIVEMAIN}/bootinst \