From 1a5f46bafbf58d1f9179e9ca213d3b880dc8de6e Mon Sep 17 00:00:00 2001 From: Jannik Schönartz Date: Wed, 21 Nov 2018 17:28:40 +0000 Subject: [ipxe] Switch to bas.intra domain and fix permission denied call Swtiched to the new bas.intra.uni-freiburg.de domain Builing undionly.kpxe was producing permission denied errors. -> build all works. --- server/ipxe/main.ipxe | 2 +- server/ipxe/minilinux.ipxe | 4 ++-- server/ipxe/registration.ipxe | 6 +++--- server/lib/shell.js | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/ipxe/main.ipxe b/server/ipxe/main.ipxe index fb778af..f0e0945 100644 --- a/server/ipxe/main.ipxe +++ b/server/ipxe/main.ipxe @@ -5,4 +5,4 @@ ifopen set img tftp://10.8.102.124/ipxeWallpaper3_scale.png || shell console --picture ${img} --x 800 --y 600 || shell -chain https://bas.stfu-kthx.net:8888/api/configloader/${uuid} \ No newline at end of file +chain https://bas.intra.uni-freiburg.de/api/configloader/${uuid} diff --git a/server/ipxe/minilinux.ipxe b/server/ipxe/minilinux.ipxe index 9d05ccc..ae70b4d 100644 --- a/server/ipxe/minilinux.ipxe +++ b/server/ipxe/minilinux.ipxe @@ -2,5 +2,5 @@ kernel tftp://10.8.102.124/kernel/kernel initrd tftp://10.8.102.124/initramfs-stage31-bss -imgargs kernel ip=${net0/ip}:10.8.102.124:${net0/gateway}:${net0/netmask} BOOTIF=01-${net0/mac} bas=bas.stfu-kthx.net:8888 -boot \ No newline at end of file +imgargs kernel ip=${net0/ip}:10.8.102.124:${net0/gateway}:${net0/netmask} BOOTIF=01-${net0/mac} bas=bas.intra.uni-freiburg.de +boot diff --git a/server/ipxe/registration.ipxe b/server/ipxe/registration.ipxe index 1011765..a20beda 100644 --- a/server/ipxe/registration.ipxe +++ b/server/ipxe/registration.ipxe @@ -28,12 +28,12 @@ param name unnamed param mac ${net0/mac} param uuid ${uuid} param ip ${net0/ip} -chain https://bas.stfu-kthx.net:8888/api/registrations/add##params +chain https://bas.intra.uni-freiburg.de/api/registrations/add##params :manual params param id 0 -chain https://bas.stfu-kthx.net:8888/api/registrations/group##params || +chain https://bas.intra.uni-freiburg.de/api/registrations/group##params || goto start :reboot @@ -51,4 +51,4 @@ login iseq ${password} sh || goto start clear username clear password -shell \ No newline at end of file +shell diff --git a/server/lib/shell.js b/server/lib/shell.js index 0d2767e..667fdeb 100644 --- a/server/lib/shell.js +++ b/server/lib/shell.js @@ -20,7 +20,7 @@ module.exports = { shell.rm(path.join(__appdir, 'ipxe', 'ipxe', 'src', 'config', 'console.h')) shell.cp(path.join(__appdir, 'ipxe', 'console.h'), path.join(__appdir, 'ipxe', 'ipxe', 'src', 'config')) // var make = 'make EMBED=' + path.join(__appdir, 'ipxe', 'main.ipxe'); - var make = 'make EMBED=' + path.join(__appdir, 'ipxe', 'main.ipxe') + ' TRUST=' + path.join(__appdir, 'bin', 'fullchain.pem') + ' bin/undionly.kpxe' + var make = 'make EMBED=' + path.join(__appdir, 'ipxe', 'main.ipxe') + ' TRUST=' + path.join(__appdir, 'bin', 'fullchain.pem')// + ' bin/undionly.kpxe' // var make = 'make EMBED=' + path.join(__appdir, 'ipxe', 'reboot.ipxe') + ' TRUST=' + path.join(__appdir, 'bin', 'fullchain.pem') + ' bin/ipxe.usb' // shell.env.PATH = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin'; shell.env.DEBUG = '' -- cgit v1.2.3-55-g7522