summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-03-23 22:12:31 +0100
committer Eric Hameleers <alien@slackware.com>2016-03-23 22:12:31 +0100
commit0213d96f99e725516fe2672738087f572c1b8ebe (patch)
tree26228b1ac53b87ba933ea99c34174a7a2aae0d8b
parent4b2d8cf1485ccdfc5871aec8408848d8db6df116 (diff)
downloadliveslak-0213d96f99e725516fe2672738087f572c1b8ebe.tar.gz
liveslak-0213d96f99e725516fe2672738087f572c1b8ebe.tar.xz
Fix a bug in the program flow related to CONSFONT.
If the predefined console font (CONSFONT variable) was not found on the system, the make_slackware_live.sh script would abort with an error.
-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 bb511fc..ea0e089 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -1574,12 +1574,6 @@ mkdir -p ${LIVE_STAGING}/boot
cp -a ${LIVE_BOOT}/boot/vmlinuz-generic*-$KGEN ${LIVE_STAGING}/boot/generic
cp -a ${LIVE_BOOT}/boot/initrd_${KVER}.gz ${LIVE_STAGING}/boot/initrd.img
cp -a ${LIVE_TOOLDIR}/syslinux ${LIVE_STAGING}/boot/
-# Make use of proper console font if we have it available:
-if [ -f /usr/share/kbd/consolefonts/${CONSFONT}.gz ]; then
- gunzip -cd /usr/share/kbd/consolefonts/${CONSFONT}.gz > ${LIVE_STAGING}/boot/syslinux/${CONSFONT}
-elif [ ! -f ${LIVE_STAGING}/boot/syslinux/${CONSFONT} ]; then
- sed -i -e "s/^font .*/#&/" ${LIVE_STAGING}/boot/syslinux/menu/*menu*.cfg
-fi
# EFI support always for 64bit architecture, but conditional for 32bit.
if [ "$SL_ARCH" = "x86_64" -o "$EFI32" = "YES" ]; then
@@ -1637,6 +1631,13 @@ for SLFILE in message.txt f2.txt syslinux.cfg lang.cfg ; do
done
mv ${LIVE_STAGING}/boot/syslinux/memtest ${LIVE_STAGING}/boot/
+# Make use of proper console font if we have it available:
+if [ -f /usr/share/kbd/consolefonts/${CONSFONT}.gz ]; then
+ gunzip -cd /usr/share/kbd/consolefonts/${CONSFONT}.gz > ${LIVE_STAGING}/boot/syslinux/${CONSFONT}
+elif [ ! -f ${LIVE_STAGING}/boot/syslinux/${CONSFONT} ]; then
+ sed -i -e "s/^font .*/#&/" ${LIVE_STAGING}/boot/syslinux/menu/*menu*.cfg
+fi
+
# -----------------------------------------------------------------------------
# Assemble the ISO
# -----------------------------------------------------------------------------