summaryrefslogtreecommitdiffstats
path: root/server/ipxe
diff options
context:
space:
mode:
authorJannik Schönartz2018-12-03 03:05:52 +0100
committerJannik Schönartz2018-12-03 03:05:52 +0100
commit3cb40c9cda0ffe4102901b87c0544c6021071185 (patch)
tree232b5c435a037d9378ae733037f9f08d8be51bd7 /server/ipxe
parentFix Error when no parent has a config (diff)
downloadbas-3cb40c9cda0ffe4102901b87c0544c6021071185.tar.gz
bas-3cb40c9cda0ffe4102901b87c0544c6021071185.tar.xz
bas-3cb40c9cda0ffe4102901b87c0544c6021071185.zip
[idoit] Add idoit add / update functionality
backend_x_ db changed. (Not storing NULL clientids anymore) Therefore the backendobject needs to be deleted before the client in the bas db is deleted. Uploading a file in idoit method added. Testing method for uploading files via curl for the tpm stuff. Added feedback option, to get a api-viable returnvalue and not the ipxe script. idoit update method for the additional hw values added. hwinfo script should now collect and update some informations. Testing inc.
Diffstat (limited to 'server/ipxe')
-rw-r--r--server/ipxe/grepSystemInfo.sh64
1 files changed, 18 insertions, 46 deletions
diff --git a/server/ipxe/grepSystemInfo.sh b/server/ipxe/grepSystemInfo.sh
index 024fb52..2f8e6cc 100644
--- a/server/ipxe/grepSystemInfo.sh
+++ b/server/ipxe/grepSystemInfo.sh
@@ -3,73 +3,45 @@
#dmidecode | grep -i UUID
# MAC
-MAC=$(ip addr show | grep -Eo -m 1 'ether\s.*\sbrd')
-MAC=${MAC#"ether "}
-MAC=${MAC%" brd"}
-echo "MAC: $MAC"
+# MAC=$(ip addr show | grep -Eo -m 1 'ether\s.*\sbrd')
+# MAC=${MAC#"ether "}
+# MAC=${MAC%" brd"}
# UUID
UUID=$(dmidecode -q -s system-uuid | grep -v '^#' | head -n 1 | tr '[a-z]' '[A-Z]')
-echo "UUID: $UUID"
-# System Information
-echo ""
-echo "######## System Informations ########"
+# System
MANUFACTURER=$(dmidecode -q -s system-manufacturer)
-echo "Manufacturer: $MANUFACTURER"
-
MODEL=$(dmidecode -q -s system-product-name)
-echo "Model: $MODEL"
-
SERIAL=$(dmidecode -q -s system-serial-number)
-echo "Serial number: $SERIAL"
-
VENDOR=$(dmidecode | grep -Eo '(Vendor).*')
-VENDOR=${VENDOR#Vendor: }
-echo "Vendor: $VENDOR"
+VENDOR=${VENDOR#"Vendor: "}
# Mainboard
-echo ""
-echo "######## Mainboard Informations ########"
MAINBOARD_MANUFACTURER=$(dmidecode -q -s baseboard-manufacturer)
-echo "Manufacturer: $MAINBOARD_MANUFACTURER"
MAINBOARD_MODEL=$(dmidecode -q -s baseboard-product-name)
-echo "Model: $MAINBOARD_MODEL"
MAINBOARD_SERIAL_NUMBER=$(dmidecode -q -s baseboard-serial-number)
-echo "Serial: $MAINBOARD_SERIAL_NUMBER"
# CPU
-echo ""
-echo "######## CPU Informations ########"
CPU_MODEL=$(dmidecode -q -s processor-version)
-echo "Model: $CPU_MODEL"
CPU_MANUFACTURER=$(dmidecode -q -s processor-manufacturer)
-echo "Manufacturer: $CPU_MANUFACTURER"
CPU_TYPE=$(dmidecode -q -s processor-family)
-echo "Type: $CPU_TYPE"
-CPUCORES=$(cat /sys/devices/system/cpu/cpu*/topology/thread_siblings_list | sort -u | wc -l)
-echo "$CPUCORES Cores"
+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)
-echo "Frequency: $CPU_FREQUENCY"
# RAM
-echo ""
-echo "######## RAM Informations ########"
-RAM=$(grep -m1 '^MemTotal:' /proc/meminfo | awk '{print $2}')
-RAM=$(( $RAM / 1024 ))
-if [ -z "$RAM" ] || [ "$RAM" -lt 500 ]; then
- # Fallback to dmidecode
- RAM=0
- for c in $(dmidecode -t 17 | grep -o 'Size:.*MB$' | awk '{print $2}'); do
- RAM=$(( $RAM + $c ))
- done
-fi
-echo "$RAM MB RAM"
-
-echo ""
-#echo "######## CURL ########"
+# RAM=$(grep -m1 '^MemTotal:' /proc/meminfo | awk '{print $2}')
+# RAM=$(( $RAM / 1024 ))
+# if [ -z "$RAM" ] || [ "$RAM" -lt 500 ]; then
+# # Fallback to dmidecode
+# RAM=0
+# for c in $(dmidecode -t 17 | grep -o 'Size:.*MB$' | awk '{print $2}'); do
+# RAM=$(( $RAM + $c ))
+# done
+# fi
+
+# Curl
#curl --data "state=6" --insecure https://bas.stfu-kthx.net:8888/api/registrations/$UUID/state
-#echo ""
-#echo ""
+curl -d "uuid=$UUID&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" -H "Content-Type: application/x-www-form-urlencoded" -X POST https://bas.intra.uni-freiburg.de/api/registrations/$UUID/update