summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2021-03-02 16:00:58 +0100
committerSimon Rettberg2021-03-02 16:01:14 +0100
commit257e3b08e5f21dd9b177e869bc434e2883ec04b1 (patch)
tree39bb5491642efe6fe76e572276572906a3cc1862
parent[SSPS] ldadp: Restart interval 100ms -> 10s (diff)
downloadsetup-scripts-257e3b08e5f21dd9b177e869bc434e2883ec04b1.tar.gz
setup-scripts-257e3b08e5f21dd9b177e869bc434e2883ec04b1.tar.xz
setup-scripts-257e3b08e5f21dd9b177e869bc434e2883ec04b1.zip
[SS?S] ipxe: Enable VRAM_SETTINGS
Required for grabbing the VRAM via ${vram}
-rw-r--r--satellit_installer/includes/10-install_ipxe.inc2
-rw-r--r--satellit_upgrader/updater.template.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/satellit_installer/includes/10-install_ipxe.inc b/satellit_installer/includes/10-install_ipxe.inc
index 5e22a24..c200807 100644
--- a/satellit_installer/includes/10-install_ipxe.inc
+++ b/satellit_installer/includes/10-install_ipxe.inc
@@ -8,7 +8,7 @@ install_ipxe() {
ln -s -f "$TFTPDIR" "$WWWDIR/tftp" || perror "Could not create symlink for tftp dir"
# Patch config
local PATH_IPXE="$1"
- ipxe_enable CONSOLE_FRAMEBUFFER CONSOLE_CMD MENU_CMD PARAM_CMD DOWNLOAD_PROTO_HTTPS IMAGE_PNG NVO_CMD IFMGMT_CMD LOGIN_CMD SHELL_CMD MENU_CMD REBOOT_CMD POWEROFF_CMD
+ ipxe_enable CONSOLE_FRAMEBUFFER CONSOLE_CMD MENU_CMD PARAM_CMD DOWNLOAD_PROTO_HTTPS IMAGE_PNG NVO_CMD IFMGMT_CMD LOGIN_CMD SHELL_CMD MENU_CMD REBOOT_CMD POWEROFF_CMD VRAM_SETTINGS
ipxe_disable NET_PROTO_STP NET_PROTO_LACP CRYPTO_80211_WEP CRYPTO_80211_WPA CRYPTO_80211_WPA2 IWMGMT_CMD IBMGMT_CMD FCMGMT_CMD CONSOLE_SERIAL
}
diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index 58454c1..15c63d3 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -380,7 +380,7 @@ if $build; then
shift
done
}
- ipxe_enable CONSOLE_FRAMEBUFFER CONSOLE_CMD MENU_CMD PARAM_CMD DOWNLOAD_PROTO_HTTPS IMAGE_PNG NVO_CMD IFMGMT_CMD LOGIN_CMD SHELL_CMD MENU_CMD REBOOT_CMD POWEROFF_CMD
+ ipxe_enable CONSOLE_FRAMEBUFFER CONSOLE_CMD MENU_CMD PARAM_CMD DOWNLOAD_PROTO_HTTPS IMAGE_PNG NVO_CMD IFMGMT_CMD LOGIN_CMD SHELL_CMD MENU_CMD REBOOT_CMD POWEROFF_CMD VRAM_SETTINGS
ipxe_disable NET_PROTO_STP NET_PROTO_LACP CRYPTO_80211_WEP CRYPTO_80211_WPA CRYPTO_80211_WPA2 IWMGMT_CMD IBMGMT_CMD FCMGMT_CMD CONSOLE_SERIAL
mysql -e 'UPDATE openslx.property SET value = "invalid" WHERE name = "server-ip"' || pwarning "Could not reset pxe menu status; manual regeneration of menu required"
{