From 92e2d90dd65dd9b68b6e779c41993d73be5d6e94 Mon Sep 17 00:00:00 2001 From: Jannik Schönartz Date: Tue, 11 Dec 2018 14:51:58 +0000 Subject: Rename registrations in registration. --- server/ipxe/grepSystemInfo.sh | 6 +++--- server/ipxe/registration.ipxe | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'server/ipxe') diff --git a/server/ipxe/grepSystemInfo.sh b/server/ipxe/grepSystemInfo.sh index a0810be..386f3b2 100644 --- a/server/ipxe/grepSystemInfo.sh +++ b/server/ipxe/grepSystemInfo.sh @@ -29,7 +29,7 @@ CPU_TYPE=$(dmidecode -q -s processor-family) CPU_CORES=$(cat /sys/devices/system/cpu/cpu*/topology/thread_siblings_list | sort -u | wc -l) #CPUMODEL=$(grep -m1 '^model name\s*:' /proc/cpuinfo | sed 's/^model name\s*:\s*//;s/\s\s*/ /g;s/^ //;s/ $//') #echo "$CPUMODEL" -CPU_FREQUENCY=$(dmidecode -q -s processor-frequency) +CPU_FREQUENCY=$(dmidecode -q -s processor-frequency)registrations CPU_FREQUENCY=${CPU_FREQUENCY%" MHz"} # RAM @@ -63,5 +63,5 @@ done # Curl -#curl --data "state=6" --insecure https://bas.stfu-kthx.net:8888/api/registrations/$UUID/state -curl -d "name=Client_$UUID&sys_manufacturer=$MANUFACTURER&sys_model=$MODEL&sys_serial=$SERIAL&cpu_model=$CPU_MODEL&cpu_manufacturer=$CPU_MANUFACTURER&cpu_type=$CPU_TYPE&cpu_cores=$CPU_CORES&cpu_frequency=$CPU_FREQUENCY&ram_size=$RAM_SIZE&ram_manufacturer=$RAM_MANUFACTURER&ram_type=$RAM_TYPE&ram_isecc=$RAM_ISECC&ram_formfactor=$RAM_FORMFACTOR" -H "Content-Type: application/x-www-form-urlencoded" -X POST --insecure https://bas.intra.uni-freiburg.de/api/registrations/$UUID/update +#curl --data "state=6" --insecure https://bas.stfu-kthx.net:8888/api/registration/$UUID/state +curl -d "name=Client_$UUID&sys_manufacturer=$MANUFACTURER&sys_model=$MODEL&sys_serial=$SERIAL&cpu_model=$CPU_MODEL&cpu_manufacturer=$CPU_MANUFACTURER&cpu_type=$CPU_TYPE&cpu_cores=$CPU_CORES&cpu_frequency=$CPU_FREQUENCY&ram_size=$RAM_SIZE&ram_manufacturer=$RAM_MANUFACTURER&ram_type=$RAM_TYPE&ram_isecc=$RAM_ISECC&ram_formfactor=$RAM_FORMFACTOR" -H "Content-Type: application/x-www-form-urlencoded" -X POST --insecure https://bas.intra.uni-freiburg.de/api/registration/$UUID/update diff --git a/server/ipxe/registration.ipxe b/server/ipxe/registration.ipxe index c7fa24c..66e34e2 100644 --- a/server/ipxe/registration.ipxe +++ b/server/ipxe/registration.ipxe @@ -4,8 +4,8 @@ set crosscert http://ca.ipxe.org/auto/ #set img https://ife-server.com/b4db0y/ipxeWallpaper4.png || shell #set img tftp://bas.stfu-kthx.net/ipxeWallpaper4.png || shell -set img tftp://10.8.102.124/ipxeWallpaper3_scale.png || shell -console --picture ${img} --x 800 --y 600 || shell +#set img tftp://10.8.102.124/ipxeWallpaper3_scale.png || shell +#console --picture ${img} --x 800 --y 600 || shell :start menu Initializing client registration @@ -28,12 +28,12 @@ param mac ${net0/mac} param uuid ${uuid} param ip ${net0/ip} param purpose Pool PC -chain https://bas.intra.uni-freiburg.de/api/registrations/add##params +chain https://bas.intra.uni-freiburg.de/api/registration/add##params :manual params param id 0 -chain https://bas.intra.uni-freiburg.de/api/registrations/group##params || +chain https://bas.intra.uni-freiburg.de/api/registration/group##params || goto start :reboot -- cgit v1.2.3-55-g7522