diff options
Diffstat (limited to 'core/rootfs/rootfs-stage32/data')
7 files changed, 0 insertions, 153 deletions
diff --git a/core/rootfs/rootfs-stage32/data/etc/systemd/system/load-gfx-driver.service b/core/rootfs/rootfs-stage32/data/etc/systemd/system/load-gfx-driver.service deleted file mode 100644 index 0534f45c..00000000 --- a/core/rootfs/rootfs-stage32/data/etc/systemd/system/load-gfx-driver.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Load DRM GFX driver and 3D -Before=sysinit.target shutdown.target -DefaultDependencies=no - -[Service] -Type=oneshot -ExecStart=/opt/openslx/scripts/systemd-load_gfx_driver -RemainAfterExit=yes diff --git a/core/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/load-gfx-driver.service b/core/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/load-gfx-driver.service deleted file mode 120000 index b72d0453..00000000 --- a/core/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/load-gfx-driver.service +++ /dev/null @@ -1 +0,0 @@ -../load-gfx-driver.service
\ No newline at end of file diff --git a/core/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/zram-swap.service b/core/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/zram-swap.service deleted file mode 120000 index c1754b11..00000000 --- a/core/rootfs/rootfs-stage32/data/etc/systemd/system/sysinit.target.wants/zram-swap.service +++ /dev/null @@ -1 +0,0 @@ -../zram-swap.service
\ No newline at end of file diff --git a/core/rootfs/rootfs-stage32/data/etc/systemd/system/zram-swap.service b/core/rootfs/rootfs-stage32/data/etc/systemd/system/zram-swap.service deleted file mode 100644 index a458b380..00000000 --- a/core/rootfs/rootfs-stage32/data/etc/systemd/system/zram-swap.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Setup zram swap partitions -DefaultDependencies=no -Wants=swap.target -Before=swap.target - -[Service] -Type=oneshot -ExecStart=/opt/openslx/scripts/systemd-zram_swap -RemainAfterExit=yes diff --git a/core/rootfs/rootfs-stage32/data/etc/tmpfiles.d/openslx-log.conf b/core/rootfs/rootfs-stage32/data/etc/tmpfiles.d/openslx-log.conf deleted file mode 100644 index 4d93fb9c..00000000 --- a/core/rootfs/rootfs-stage32/data/etc/tmpfiles.d/openslx-log.conf +++ /dev/null @@ -1 +0,0 @@ -d /var/log/openslx 0777 root root diff --git a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-load_gfx_driver b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-load_gfx_driver deleted file mode 100755 index 2d113638..00000000 --- a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-load_gfx_driver +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -if lsmod | grep -q '^nvidia\s'; then - # nvidia kernel module was loaded in stage31 - download libs - version=$( cat /sys/module/nvidia/version ) - if [ -n "$version" ]; then - echo "Proprietary nvidia kernel drivers v$version loaded - fetch user space libs" - /opt/openslx/scripts/systemd-download_slx_addons "nvidia-libs@$version" - /opt/openslx/scripts/systemd-setup_slx_addons "nvidia-libs@$version" || exit 1 - fi -fi - -# Seems we can finally always do that; in fact, not doing so seems to crash VMs left and right -echo -e "# Written by load-gfx-driver\nSLX_VMWARE_3D=yes" >> "/opt/openslx/config" - -exit 0 diff --git a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-zram_swap b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-zram_swap deleted file mode 100755 index 413ce215..00000000 --- a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-zram_swap +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/ash -# ----------------------------------------------------------------------------- -# -# Copyright (c) 2013..2018 bwLehrpool-Projektteam -# -# This program/file is free software distributed under the GPL version 2. -# See https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html -# -# If you have any feedback please consult https://bwlehrpool.de and -# send your feedback to support@bwlehrpool.de. -# -# General information about bwLehrpool can be found at https://bwlehrpool.de -# -# ----------------------------------------------------------------------------- -# -# Local hard disk autodetection script for OpenSLX linux stateless clients, -# detecting swap and special partitions - -############################################################################# - - -# Add zram swap -# Some older ubuntu kernels had a problem here, see https://bugs.launchpad.net/ubuntu/+source/linux-lts-raring/+bug/1217189 -# So make sure you're up to date - -make_swap () { - [ $# -ne 3 ] && echo "make_swap: Wrong parameter count $#" && return 1 - local USE="$1" - local DEV="$2" - local STREAMS="$3" - echo "$USE" > "/sys/block/zram${DEV}/disksize" || return 1 - [ -n "$STREAMS" ] && echo "$STREAMS" > "/sys/block/zram${DEV}/max_comp_streams" - ( - mkswap "/dev/zram${DEV}" - swapon "/dev/zram${DEV}" -p 1000 # high priority (in case we have hdd swap 0x82, prefer zram) - ) & -} - -# Count physical CPUs -CPUS=$(cat /sys/devices/system/cpu/cpu*/topology/thread_siblings_list | sort -u | wc -l) # cat for * -if [ -z "$CPUS" ]; then - echo "ERROR: Could not determine CPU core count" -else - CPUS=1 -fi - -KERN=$(uname -r) -if [ "${KERN%%.*}" -le 4 ]; then - DEVS=$CPUS - [ "$DEVS" -gt "16" ] && DEVS=16 # zram can only handle up to 32 devices, the system can apparently even just handle 29 swap partitions, so use a reasonable upper limit - STREAMS= -else - DEVS=1 - STREAMS=$CPUS -fi - -if [ -e "/sys/class/zram-control/hot_add" ]; then - : # nothing to do, loaded and hot_add available -elif ! modprobe zram "num_devices=$DEVS"; then - echo "ERROR: Could not load zram module" - exit 1 -fi - -TOTAL=$(grep ^MemTotal /proc/meminfo | awk '{print $2}') -USE=$(( TOTAL / ( 2 * DEVS ) )) -echo "Have $CPUS cores, $TOTAL kb mem, use $USE kb zram swap each for $DEVS devices." -USE=$(( USE * 1024 )) -DEV=0 -NUM=0 -FAILS=0 -while [ "$NUM" -lt "$DEVS" ]; do - if [ -e "/sys/block/zram${DEV}" ]; then - if ! [ -e "/sys/block/zram${DEV}/initstate" ] || [ "$(cat "/sys/block/zram${DEV}/initstate")" = 0 ]; then - if make_swap "$USE" "$DEV" "$STREAMS"; then - NUM=$(( NUM + 1 )) - fi - fi - DEV=$(( DEV + 1 )) - elif [ -e "/sys/class/zram-control/hot_add" ]; then - DEV=$(cat /sys/class/zram-control/hot_add) - if [ -z "$DEV" ]; then - echo "ERROR: Cannot hot_add another zram device" - break - fi - if make_swap "$USE" "$DEV" "$STREAMS"; then - NUM=$(( NUM + 1 )) - else - FAILS=$(( FAILS + 1 )) - if [ "$FAILS" -gt 4 ]; then - echo "ERROR: Could not swap on hot added device -- giving up" - break - fi - fi - DEV=$(( DEV + 1 )) - else - echo "ERROR: Cannot add another zram device: No hot_add support" - break - fi -done - -# Increase min free memory so we have enough mem available when trying to move -# something to zram swap. We want 1%, or at least 64MiB -CURRENT=$(cat "/proc/sys/vm/min_free_kbytes") -TOTAL=$(awk '{ if ($1 == "MemTotal:") { print $2; exit } }' /proc/meminfo) -WANT=$(( TOTAL / 100 )) -[ "$WANT" -gt 65535 ] || WANT=65535 # minimum 64M -if [ "$CURRENT" -lt "$WANT" ]; then - echo "$WANT" > "/proc/sys/vm/min_free_kbytes" -fi - -# Wait, so we don't trigger swap.target too early -wait - -exit 0 - |