From fe9e8ff79a62c437c47ebf4cee41482f2ad6b44f Mon Sep 17 00:00:00 2001 From: nospoonuser Date: Tue, 13 Nov 2018 12:03:17 +0100 Subject: [PATCH] some menu fixes. mostly cosmetic --- scripts/bootstrap.sh | 2 +- scripts/menufunction.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index b603d07..7ccfb0f 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -128,7 +128,7 @@ cat > ${CHROOT}/etc/update-motd.d/01-info << EOF #!/bin/bash echo -e "\n===== GENERAL =====\n" -echo " Systemname: ${LIVE_NAME}" +echo " ${LIVE_NAME}" echo " Buildtime: ${BUILD_TIME}" echo " Root password: ${LIVE_ROOTPW}" echo " SSH: ${SSH_STATUS}" diff --git a/scripts/menufunction.sh b/scripts/menufunction.sh index a9af7da..65885f9 100644 --- a/scripts/menufunction.sh +++ b/scripts/menufunction.sh @@ -46,7 +46,7 @@ menulivepxe(){ if [ -n "$PXE_HTTP_BASE" ] then - PXE_FETCH_HTTP="http://${PXE_SERVER}${PXE_HTTP_BASE}" + PXE_FETCH_HTTP="http://${PXE_SERVER}:${PXE_HTTP_PORT}${PXE_HTTP_BASE}" fi if [ -n "$PXE_FTP_BASE" ] @@ -197,6 +197,7 @@ if [ -n "$SERIAL_PORT" ]; then -e "s/(label) ([a-z]+)/\1 \2-${dist}-serial/g" \ -e "s/(menu label .*)/\1 with Serial Console/g" \ -e "s/(${dist}-installer)/\/\1/g" \ + -e "/menu default/d" \ -e "s/(append.+)(--- quiet)/\1console=ttyS${SERIAL_PORT},${SERIAL_SPEED}n8 \2/" \ $WORKDIR/INSTALLER/${dist}.cfg fi @@ -226,6 +227,7 @@ else edebug "Try to download $archiso_pxe_url" curl -s $archiso_pxe_url | sed -r \ + -e "s/Boot Arch/Arch/g" \ -e "s~boot~/${archbasedir}/boot~g" \ -e "s~basedir=arch~basedir=${ARCHISO_HTTP_BASE}/${ARCH_BASEDIR}~g" \ -e "s/\\$\{pxeserver\}/${ARCHISO_SERVER}:${ARCHISO_HTTP_PORT}/g" \