From 1f6242b53f169c23f7d7d4961114b7a0aca5772a Mon Sep 17 00:00:00 2001 From: Jannik Schönartz Date: Tue, 16 Mar 2021 19:59:47 +0000 Subject: [ipxe] This was uncommited on productive ... --- server/ipxe/registration.ipxe | 2 +- server/lib/confighelper.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/ipxe/registration.ipxe b/server/ipxe/registration.ipxe index fdfbcfa..1d50e5e 100644 --- a/server/ipxe/registration.ipxe +++ b/server/ipxe/registration.ipxe @@ -2,7 +2,7 @@ # Wallpaper set img https://bas.intra.uni-freiburg.de/files/ipxe_wallpaper.png || goto start -console --picture ${img} --x 800 --y 600 +console --picture ${img} --x 800 --y 600 || console --x 1024 --y 768 || :start menu Initializing client registration diff --git a/server/lib/confighelper.js b/server/lib/confighelper.js index 6e6f152..2472e97 100644 --- a/server/lib/confighelper.js +++ b/server/lib/confighelper.js @@ -181,7 +181,7 @@ async function prepareConfig (configInfo, noScript) { var menuscript = '' script += '#!ipxe\r\n\r\n' script += 'set img https://bas.intra.uni-freiburg.de/files/ipxe_wallpaper.png || goto start\r\n' - script += `console --picture \${img} --x 800 --y 600 ||\r\n\r\n` + script += `console --picture \${img} --x 800 --y 600 || console --x 1024 --y 768 ||\r\n\r\n` script += ':start\r\n' script += 'menu ' + config.name + '\r\n' config.entries.forEach(entry => { @@ -248,7 +248,7 @@ async function _createDynamicMenu (configInfos, noScript) { var defaultentry = '' script += '#!ipxe\r\n\r\n' script += 'set img https://bas.intra.uni-freiburg.de/files/ipxe_wallpaper.png || goto start\r\n' - script += `console --picture \${img} --x 800 --y 600 ||\r\n\r\n` + script += `console --picture \${img} --x 800 --y 600 || console --x 1024 --y 768 ||\r\n\r\n` script += ':start\r\n' script += 'menu ' + 'Choose one configuration to boot' + '\r\n' configs.forEach(config => { @@ -276,7 +276,7 @@ async function _createDynamicMenu (configInfos, noScript) { function getDefaultConfig (client) { let script = '#!ipxe\r\n\r\n' script += 'set img https://bas.intra.uni-freiburg.de/files/ipxe_wallpaper.png || goto start\r\n' - script += `console --picture \${img} --x 800 --y 600 ||\r\n\r\n` + script += `console --picture \${img} --x 800 --y 600 || console --x 1024 --y 768 ||\r\n\r\n` script += ':start\r\n' script += 'menu ' + 'Client is successfully registered' + '\r\n' script += 'item --gap BAS-ID: ' + client.id + '\r\n' -- cgit v1.2.3-55-g7522