From 63dd06cd18d891fd97286906afe3b4f66a15b6e3 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 4 May 2021 15:14:32 +0200
Subject: [dnbd3-proxy-mode] Increase priority etc. of dnbd3-server

---
 .../dnbd3-proxy-mode/data/etc/systemd/system/dnbd3-proxy.service      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/modules/dnbd3-proxy-mode/data/etc/systemd/system/dnbd3-proxy.service b/core/modules/dnbd3-proxy-mode/data/etc/systemd/system/dnbd3-proxy.service
index 709e0724..b5893dd0 100644
--- a/core/modules/dnbd3-proxy-mode/data/etc/systemd/system/dnbd3-proxy.service
+++ b/core/modules/dnbd3-proxy-mode/data/etc/systemd/system/dnbd3-proxy.service
@@ -10,3 +10,7 @@ Restart=always
 RestartSec=3
 TimeoutStopSec=10
 LimitNOFILE=65536
+LimitNICE=-2
+IOSchedulingClass=best-effort
+IOSchedulingPriority=2
+OOMScoreAdjust=-100
-- 
cgit v1.2.3-55-g7522


From f2d3546f6f6992a229e48b8c2c653f175e6880fa Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 4 May 2021 15:31:40 +0200
Subject: [run-virt-docker] remove deprecated file

---
 .../etc/X11/Xreset.d/cleanup-container-session     | 32 ----------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 core/modules/run-virt-docker/data/etc/X11/Xreset.d/cleanup-container-session

diff --git a/core/modules/run-virt-docker/data/etc/X11/Xreset.d/cleanup-container-session b/core/modules/run-virt-docker/data/etc/X11/Xreset.d/cleanup-container-session
deleted file mode 100644
index 07da7b37..00000000
--- a/core/modules/run-virt-docker/data/etc/X11/Xreset.d/cleanup-container-session
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-#exec &> /tmp/cleanup-container-session.log
-#set -x 
-
-# remove scripts and autostart from $HOME
-USER_CONTAINER_CONTEXT="$HOME/.local/docker"
-USER_CONTAINER_AUTOSTART="$HOME/.config/autostart/docker-init.desktop"
-[ -f "$USER_CONTAINER_AUTOSTART" ] && rm -- "$USER_CONTAINER_AUTOSTART"
-[ -d "$USER_CONTAINER_CONTEXT" ] && rm -rf -- "$USER_CONTAINER_CONTEXT"
-
-# remove running containers
-[ -n "$(docker ps -aq)" ] && docker rm -f $(docker ps -aq) > /dev/null
-
-
-## CLEANUP GVFS RELATED STUFF
-#
-
-# TODO: i don't know how to properly unmount a users gvfs locations under GVFS_MOUNTDIR.
-# Either root can't do that for him nor root can't su into user and do it. (because of dbus thing)
-# Maybe one simple solution could be that root kills the gvfsd-smb process ?
-GVFS_MOUNTDIR="/run/user/$( id -u "$USER" )/gvfs"
-#for location in "$GVFS_MOUNTDIR"/*; do
-#	[ -d "$location" ] && gio mount -u "$location"
-#done
-
-# Look for soft link in HOME and HOME/Desktop whith point into GVFS_MOUNTDIR and delete them
-FIND_OPT="-maxdepth 1 -type l"
-DEAD_LINKS=$(find $HOME $FIND_OPT && find ${HOME}/Desktop/ $FIND_OPT )
-for dead_link in $DEAD_LINKS; do
-	[ "$GVFS_MOUNTDIR" = "$(dirname $(readlink $dead_link))" ] && rm -f -- "$dead_link";
-done
-- 
cgit v1.2.3-55-g7522


From f160982bae52260e78a6b7128e36546c3500f793 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 4 May 2021 16:14:12 +0200
Subject: [splashtool] remove unneded file

---
 core/modules/splashtool/data/: | 35 -----------------------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 core/modules/splashtool/data/:

diff --git a/core/modules/splashtool/data/: b/core/modules/splashtool/data/:
deleted file mode 100644
index 71d7b9a3..00000000
--- a/core/modules/splashtool/data/:
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/ash
-
-		screen_size="$(fbset | awk '$1 ~ /geometry/ {print $2" "$3}')"
-		screen_width="${screen_size%% *}"
-		screen_height="${screen_size#* }"
-		fbsplash_cfg="/etc/fbsplash.cfg"
-		fbsplash_ppm="/etc/splash.ppm.gz"
-		if [ -s "$fbsplash_ppm" ]; then
-			ppm_size="$(zcat "$fbsplash_ppm" | sed -n 2p)"
-		else
-			fbsplash_ppm="/etc/splash.ppm"
-			if [ -s "$fbsplash_ppm" ]; then
-				ppm_size="$(sed -n 2p "$fbsplash_ppm")"
-			else
-				echo "Splash screen requested, but not found in initramfs..." >&4
-				MUTED_OUTPUT=
-			fi
-		fi
-		ppm_width="${ppm_size%% *}"
-		ppm_height="${ppm_size#* }"
-		ppm_height="${ppm_height%% *}" # make sure nothing weird is trailing
-		img_left="$(( ( screen_width - ppm_width ) / 2  ))"
-		img_top="$(( ( screen_height - ppm_height ) / 2  ))"
-		# just checking if nothing too weird is set
-		if [ -n "$img_left" ] && [ -n "$img_top" ] \
-			&& [ "$img_left" -ge 0 ] && [ "$img_left" -lt 8096 ] \
-			&& [ "$img_top" -ge 0 ] && [ "$img_top" -lt 8096 ]; then
-			printf "IMG_TOP=%d\nIMG_LEFT=%d\n" \
-				"$img_top" "$img_left" \
-				> "$fbsplash_cfg"
-			fbsplash -b -i "$fbsplash_cfg" -s "$fbsplash_ppm" || MUTED_OUTPUT=
-		else
-			# otherwise just use top left and be done with it
-			fbsplash -b -s "$fbsplash_ppm" || MUTED_OUTPUT=
-		fi
-- 
cgit v1.2.3-55-g7522


From fd683129cead36a5a7341f72ca14807e6f8f8a50 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Wed, 5 May 2021 17:22:45 +0200
Subject: [run-virt] Linux script's LIESMICH/README edited a bit.

---
 .../data/opt/openslx/vmchooser/data/linux/LIESMICH | 30 +++++++++++++---------
 .../data/opt/openslx/vmchooser/data/linux/README   | 20 +++++++++------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/LIESMICH b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/LIESMICH
index cf5dbc5d..54a30955 100755
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/LIESMICH
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/LIESMICH
@@ -8,15 +8,15 @@ Binaries in der genutzen virtuellen Maschine enthalten sind.
 
 Folgende Programme werden benötigt:
 
-awk, cat, chmod, chown, cut, cvt, find, grep, head, hexdump, ln, logger, 
-mkdir, mount, mount.cifs, mv, ping, printf, ps, rmdir, sed, sleep, su, 
-systemctl, timeout, unlink, xdg-user-dir, xrandr, xterm.
+awk, cat, chmod, chown, cut, cvt, find, fusermount, grep, head, hexdump, 
+ln, logger, mkdir, mount, mount.cifs, mv, ping, printf, ps, rmdir, sed, 
+sleep, su, systemctl, timeout, unlink, xdg-user-dir, xrandr, xterm.
 
-Als mitunter fehlend haben sich insbesondere mount.cifs (wenn SMB-Laufwerke 
-nicht eingebunden werden und xdg-user-dir (wenn keine Icons auf dem Desktop 
-erscheinen) erwiesen. Zur Ermittlung eventuell fehlender binaries ist 
-hilfreich, das Skript openslx mit root-Rechten von Hand zu starten und auf 
-"…not found" u.ä. zu achten.
+Als mitunter fehlend haben sich insbesondere mount.cifs, mount.davfs (wenn 
+SMB- bzw. Webdav-Laufwerke nicht eingebunden werden) und xdg-user-dir 
+(wenn keine Icons auf dem Desktop erscheinen) erwiesen. Zur Ermittlung 
+eventuell fehlender binaries ist hilfreich, das Skript openslx mit root-
+Rechten von Hand zu starten und auf "…not found" u.ä. zu achten.
 
 
 Logeinträge:
@@ -28,14 +28,20 @@ die Einträge sind zudem wie folgt aufgeschlüsselt:
 'openslx utility script': openslx-Hauptskript
 'openslx sharemapper': Dienstskript zum Einhängen der Netzlaufwerke,
 'openslx resolution utility': Dienstskript zur Bildschirmauflösung.
+'openslx umounter': Dienstskript zum Unmounten eingehängter Netzlauf-
+                    werke bei Shutdown. (Anmerkung: besonders bei per 
+                    Userspace über fusermount eingehängten Webdav-
+                    laufwerken wichtig, da es sonst zu Wartezeiten
+                    beim Shutdown der VM kommen kann.)
 
 
 Enthaltene Skripte:
 
 vm_installer:	Dieses Skript einmalig in einer lokalen, permanenten (also 
 		nicht innerhalb des Poolsystems) Virtuellen Maschine ausführen. 
-		Es schreibt zwei systemd-Servicedateien und verlinkt diese,
-		um beim Systemstart folgende Skripte zu starten:
+		Eine vorherige Installation sollte erkannt und korrigiert
+		werden. Es schreibt zwei systemd-Servicedateien und verlinkt 
+		diese, um beim Systemstart folgende Skripte zu starten:
 
 openslx:	Das Skript openslx wird von einem durch vm_installer 
 		erzeugten systemd-Dienst gestartet. Es ruft die Funktionen 
@@ -51,8 +57,8 @@ resolution_standalone: Einzelstehende Version des resolution-Skriptes, die
 		Einbindung innerhalb der VM (Xsetup/Xreset) muss daher 
 		selbst gesorgt werden.
 
-		Anmerkung: Dieses Skript wird nur unstetig gewartet, die 
-		Nutzung von openslx wird daher empfohlen.
+		Anmerkung: Dieses Skript wird nicht mehr bzw. nur unstetig 
+		gewartet, die Nutzung von openslx wird daher sehr mpfohlen.
 
 
 Veraltet als Einzelskripte:
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/README b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/README
index 6a58e448..885fba7e 100755
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/README
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/README
@@ -8,13 +8,14 @@ check the usual log files, of course).
 
 These programs are needed:
 
-awk, cat, chmod, chown, cut, cvt, find, grep, head, hexdump, ln, logger,
-mkdir, mount, mount.cifs, mv, ping, printf, ps, rmdir, sed, sleep, su,
-systemctl, timeout, unlink, xdg-user-dir, xrandr, xterm.
+awk, cat, chmod, chown, cut, cvt, find, fusermount, grep, head, hexdump, 
+ln, logger, mkdir, mount, mount.cifs, mv, ping, printf, ps, rmdir, sed, 
+sleep, su, systemctl, timeout, unlink, xdg-user-dir, xrandr, xterm.
 
-Two likely candidates are in particular mount.cifs and xdg-user-dir. Do 
-detect missing binaries it is helpful to start the script openslx with root 
-permissions by hand and check for "…not found" messages.
+Some likely candidates are in particular mount.cifs, mount.davfs and 
+xdg-user-dir. To detect missing binaries it is helpful to start the script 
+openslx in the virtual machine with root permissions by hand and check for 
+"... not found" messages.
 
 
 Log file entries:
@@ -25,12 +26,14 @@ distinguished by a preceding 'openslx'; the entries are further itemised by:
 'openslx utility script': openslx main script,
 'openslx sharemapper': utility to mount network shares,
 'openslx resolution utility': utility to set monitor resolution.
+'openslx umounter': utility for unmounting previously script-mounted network 
+                    drives at shutdown. (Ann.: This is important at userspace
+                    mounted (fusermount) webdav shares, as it else may lead 
+                    to waiting time at shutdown of the virtual machine.)
 
 
 Included scripts:
 
-This package consists of following scripts:
-
 vm_installer: 	This script is to be started once in a local, permanent (so 
 		not within the pool system environment) virtual machine. It 
 		writes two systemd service files and links them, so following 
@@ -44,6 +47,7 @@ openslx:	The script openslx will be started via systemd service written
 umnt_shares:	(before shutdown.target): Unmounts given network shares at 
 		virtual machine shutdown.
 
+
 resolution_standalone: Standalone version of resolution sctipt. Needs no 
 		preliminary work done by systemd or vm_runtime. It has to be 
 		embedded/startedt via adequate means by hand (eg. 
-- 
cgit v1.2.3-55-g7522