diff options
Diffstat (limited to 'remote/rootfs/rootfs-stage31')
-rw-r--r-- | remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig | 17 | ||||
-rw-r--r-- | remote/rootfs/rootfs-stage31/data/inc/setup_network | 11 | ||||
-rw-r--r-- | remote/rootfs/rootfs-stage31/data/inc/setup_stage32 | 6 | ||||
-rwxr-xr-x | remote/rootfs/rootfs-stage31/data/init | 4 | ||||
-rw-r--r-- | remote/rootfs/rootfs-stage31/module.conf | 1 | ||||
-rw-r--r-- | remote/rootfs/rootfs-stage31/module.conf.ubuntu | 1 | ||||
-rw-r--r-- | remote/rootfs/rootfs-stage31/templates/drm.cfg | 8 |
7 files changed, 35 insertions, 13 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig index 39680afc..ec98ff70 100644 --- a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig +++ b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig @@ -5,8 +5,6 @@ echo "Configuring stage 3.2 ..." # first a few variables CONFIG="${FUTURE_ROOT}/opt/openslx/config" -UUID=$(dmidecode -s system-uuid | grep -m1 -E '^[0-9A-F\-]{36}$') - ######################################################################### # # This function downloads the config containing environment variables @@ -15,7 +13,7 @@ fetch_sysconfig() { [ -e "$CONFIG" ] && grep -E '^#_RCONFIG_TAG$' "$CONFIG" > /dev/null \ && echo "Config already fetched." && return 0 - download "${SLX_BASE_PATH}/config?uuid=${UUID}" "${CONFIG}-remote" || return 1 + download "${SLX_BASE_PATH}/config" "${CONFIG}-remote" || return 1 echo "# Config fetched from $URL" >> "$CONFIG" echo "#_RCONFIG_TAG" >> "$CONFIG" @@ -28,7 +26,7 @@ fetch_sysconfig() { fetch_config_files() { [ -e "${CONFIG}.tgz" ] && echo "config.tgz already downloaded." && return 0 - download "${SLX_BASE_PATH}/config.tgz?uuid=${UUID}" "${CONFIG}.tgz" + download "${SLX_BASE_PATH}/config.tgz" "${CONFIG}.tgz" } @@ -98,6 +96,17 @@ HEREEND # fetch_sysconfig || drop_shell "Could not download remote config" +if ! ash -n "${CONFIG}-remote"; then + echo -e "\n\tFATAL: Could not download configuration!" + echo -e "\tAborting boot since the system would be in an unusable state." + echo -en "\tRebooting in 60 seconds" + timeout=60 + while [ $(( timeout-- )) -gt 0 ]; do + echo -n "." + sleep 1 + done + echo b > /proc/sysrq-trigger +fi . "${CONFIG}-remote" || drop_shell "Could not source remote config" fetch_config_files || drop_shell "Could not download config.tgz" update_sysconfig || drop_shell "Could not update sysconfig" diff --git a/remote/rootfs/rootfs-stage31/data/inc/setup_network b/remote/rootfs/rootfs-stage31/data/inc/setup_network index 13c52289..956df03c 100644 --- a/remote/rootfs/rootfs-stage31/data/inc/setup_network +++ b/remote/rootfs/rootfs-stage31/data/inc/setup_network @@ -26,14 +26,21 @@ mkdir -p "${FUTURE_ROOT}/etc/udev/rules.d" IP_OUT=$(ip a | grep -B 1 "/ether" | sed -r '/^--$/d;$!N;s#^[0-9]+: ([a-z0-9\.:]+): .*?/ether ([0-9a-fA-Z:]+) .*$#\1==\2#') if ! echo "$IP_OUT" | grep -q -- "$MAC"; then - drop_shell "Boot interface not found in interface list. NIC driver missing?" + drop_shell "--- +$(ip a) +--- +$IP_OUT +--- + +Boot interface $MAC not found in interface list. NIC driver missing?" + : fi for LINE in $IP_OUT; do IFACE=$(echo "$LINE" | awk -F '==' '{printf $1}') IFMAC=$(echo "$LINE" | awk -F '==' '{printf $2}' | tr '[A-Z]' '[a-z]') # udev requires mac addesses to be lowercase (a-f), see http://www.debianhelp.co.uk/udev.htm echo "${IFACE} = ${IFMAC}" - + if [ "x$IFMAC" == "x$MAC" ]; then brctl addbr "$BRIDGE" || drop_shell "Could not create bridge $BRIDGE" brctl stp "$BRIDGE" 0 diff --git a/remote/rootfs/rootfs-stage31/data/inc/setup_stage32 b/remote/rootfs/rootfs-stage31/data/inc/setup_stage32 index 5ec5a69d..070583aa 100644 --- a/remote/rootfs/rootfs-stage31/data/inc/setup_stage32 +++ b/remote/rootfs/rootfs-stage31/data/inc/setup_stage32 @@ -58,11 +58,9 @@ if [ $SPLASH -eq 1 ]; then fi fi -# Kinda specific for virtualization environment: Autologin and run VM for benchmarks -if [ -n "$SLX_BENCHMARK_VM" ]; then +# Auto login to demo user requested? +if [ -n "$SLX_AUTOLOGIN" ]; then # Enable KDM autologin for demo user sed -i 's/^AutoLoginUser=.*//;s/^AutoLoginEnable=.*/AutoLoginEnable=true\nAutoLoginUser=demo/' "${FUTURE_ROOT}/etc/kde4/kdm/kdmrc" - # Running the VM automatically has to be taken care of by run-virt and vmchooser. SLX_BENCHMARK_VM should contain - # a numeric value for the index in vmchooser fi diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init index 5e6d1caf..4b3a800b 100755 --- a/remote/rootfs/rootfs-stage31/data/init +++ b/remote/rootfs/rootfs-stage31/data/init @@ -118,6 +118,10 @@ for mnt in proc sys run ; do done # HACK HACK: Klausurmodus +if [ "x$SLX_PVS_DEDICATED" = "xyes" ] || [ "x$SLX_PVS_HYBRID" = "xyes" ]; then + sed -i '/^SLX_EXAM=/d' "${FUTURE_ROOT}/opt/openslx/config" + SLX_EXAM= +fi # Putting this here as we're hopefully moving to the all new dracut solution soon # so there's no reason to make it pretty now if [ -n "$SLX_EXAM" ]; then diff --git a/remote/rootfs/rootfs-stage31/module.conf b/remote/rootfs/rootfs-stage31/module.conf index e09e744b..b41b1f10 100644 --- a/remote/rootfs/rootfs-stage31/module.conf +++ b/remote/rootfs/rootfs-stage31/module.conf @@ -1,6 +1,5 @@ REQUIRED_BINARIES=" ntpdate - dmidecode " REQUIRED_MODULES=" busybox diff --git a/remote/rootfs/rootfs-stage31/module.conf.ubuntu b/remote/rootfs/rootfs-stage31/module.conf.ubuntu index 6ced7b11..35c9927b 100644 --- a/remote/rootfs/rootfs-stage31/module.conf.ubuntu +++ b/remote/rootfs/rootfs-stage31/module.conf.ubuntu @@ -1,4 +1,3 @@ REQUIRED_INSTALLED_PACKAGES=" ntpdate - dmidecode " diff --git a/remote/rootfs/rootfs-stage31/templates/drm.cfg b/remote/rootfs/rootfs-stage31/templates/drm.cfg index 93bdf2b3..1456ef3b 100644 --- a/remote/rootfs/rootfs-stage31/templates/drm.cfg +++ b/remote/rootfs/rootfs-stage31/templates/drm.cfg @@ -5,19 +5,25 @@ 10de:087d @nvidia ## # 10de-11c0: nvidia Geforce GTX 660 (OG) +# 10de-11fa: nvidia Quadro K4000 (RT) # 10de-0fc2: nvidia GeForce GT 630 (OG) # 10de-0dd8: nvidia Quadro 2000 # 10de-0ff3: nvidia Quadro K420 # 10de-0df8: nvidia Quadro 600 +# 10de-06dd: nvidia Quadro 4000 +# 10de-1382: nvidia GeForce GTX 745 (HN) ## 10de:11c0 @nvidia +10de:11fa @nvidia 10de:0fc2 @nvidia 10de:0dd8 @nvidia 10de:0ff3 @nvidia 10de:0df8 @nvidia +10de:06dd @nvidia +10de:1382 @nvidia ## intel # Dell GX 620 8086:2772 i915 # aliases -@nvidia nvidia/nvidia.ko nvidia/nvidia-uvm.ko nvidia/nvidia-modeset.ko +@nvidia nvidia/nvidia.ko nvidia/nvidia-uvm.ko nvidia/nvidia-modeset.ko nvidia/nvidia-drm.ko @nvidia_fallback nouveau |