nospoonuser
/
mklive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some menu fixes. mostly cosmetic

This commit is contained in:
nospoonuser 2018-11-13 12:03:17 +01:00
parent b0a1a5867d
commit fe9e8ff79a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/bootstrap.sh
View File

@ -128,7 +128,7 @@ cat > ${CHROOT}/etc/update-motd.d/01-info << EOF
#!/bin/bash #!/bin/bash
echo -e "\n===== GENERAL =====\n" echo -e "\n===== GENERAL =====\n"
echo " Systemname: ${LIVE_NAME}" echo " ${LIVE_NAME}"
echo " Buildtime: ${BUILD_TIME}" echo " Buildtime: ${BUILD_TIME}"
echo " Root password: ${LIVE_ROOTPW}" echo " Root password: ${LIVE_ROOTPW}"
echo " SSH: ${SSH_STATUS}" echo " SSH: ${SSH_STATUS}"

4
scripts/menufunction.sh
View File

@ -46,7 +46,7 @@ menulivepxe(){
if [ -n "$PXE_HTTP_BASE" ] if [ -n "$PXE_HTTP_BASE" ]
then then
PXE_FETCH_HTTP="http://${PXE_SERVER}${PXE_HTTP_BASE}" PXE_FETCH_HTTP="http://${PXE_SERVER}:${PXE_HTTP_PORT}${PXE_HTTP_BASE}"
fi fi
if [ -n "$PXE_FTP_BASE" ] 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/(label) ([a-z]+)/\1 \2-${dist}-serial/g" \
-e "s/(menu label .*)/\1 with Serial Console/g" \ -e "s/(menu label .*)/\1 with Serial Console/g" \
-e "s/(${dist}-installer)/\/\1/g" \ -e "s/(${dist}-installer)/\/\1/g" \
-e "/menu default/d" \
-e "s/(append.+)(--- quiet)/\1console=ttyS${SERIAL_PORT},${SERIAL_SPEED}n8 \2/" \ -e "s/(append.+)(--- quiet)/\1console=ttyS${SERIAL_PORT},${SERIAL_SPEED}n8 \2/" \
$WORKDIR/INSTALLER/${dist}.cfg $WORKDIR/INSTALLER/${dist}.cfg
fi fi
@ -226,6 +227,7 @@ else
edebug "Try to download $archiso_pxe_url" edebug "Try to download $archiso_pxe_url"
curl -s $archiso_pxe_url | sed -r \ curl -s $archiso_pxe_url | sed -r \
-e "s/Boot Arch/Arch/g" \
-e "s~boot~/${archbasedir}/boot~g" \ -e "s~boot~/${archbasedir}/boot~g" \
-e "s~basedir=arch~basedir=${ARCHISO_HTTP_BASE}/${ARCH_BASEDIR}~g" \ -e "s~basedir=arch~basedir=${ARCHISO_HTTP_BASE}/${ARCH_BASEDIR}~g" \
-e "s/\\$\{pxeserver\}/${ARCHISO_SERVER}:${ARCHISO_HTTP_PORT}/g" \ -e "s/\\$\{pxeserver\}/${ARCHISO_SERVER}:${ARCHISO_HTTP_PORT}/g" \