From c5972958ba85b07992e607aeb924f05ce19806e4 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sun, 17 Sep 2023 21:57:52 +0200 Subject: make_slackware_live.sh: move KAPPEND definition to an earlier position The pxeserver.tpl will start using @KAPPEND@ template, so the $KAPPEND variable needs to be defined when we get there. --- make_slackware_live.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/make_slackware_live.sh b/make_slackware_live.sh index d1e860e..9ea95fd 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -1566,6 +1566,11 @@ else TRIM=${TRIM:-"none"} fi +# Determine additional boot parameters to be added: +if [ -z ${KAPPEND} ]; then + eval KAPPEND=\$KAPPEND_${LIVEDE} +fi + # Determine possible blacklist to use: if [ -z "${BLACKLIST}" ]; then eval BLACKLIST=\$BLACKLIST_${LIVEDE} @@ -3467,11 +3472,6 @@ 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 ${SQ_COMP} ${SQ_COMP_PARAMS} -# Determine additional boot parameters to be added: -if [ -z ${KAPPEND} ]; then - eval KAPPEND=\$KAPPEND_${LIVEDE} -fi - # Copy the syslinux configuration. # The next block checks here for a possible UEFI grub boot image: cp -a ${LIVE_TOOLDIR}/syslinux ${LIVE_STAGING}/boot/ -- cgit v1.2.3