From 4e7e1d95841d254945979d5bb1d60157e18706b5 Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Wed, 19 Sep 2018 17:10:13 +0200 Subject: [all] New license clauses as to ticket #3132: No more openSLX GmbH --- .../data/opt/openslx/scripts/systemd-run_virt_env | 15 ++++++------ .../data/opt/openslx/scripts/vmchooser-xml_filter | 15 ++++++------ .../data/opt/openslx/vmchooser/config/smb.conf | 12 ++++++---- .../opt/openslx/vmchooser/config/udhcpd-nat1.conf | 21 +++++++++-------- .../vmchooser/data/linux/includes/10_functions.inc | 27 ---------------------- .../data/linux/includes/60_resolution.inc | 25 +++++++++++++++++++- .../opt/openslx/vmchooser/data/linux/resolution | 6 ++++- .../data/opt/openslx/vmchooser/vmchooser-run_virt | 15 ++++++------ 8 files changed, 72 insertions(+), 64 deletions(-) (limited to 'core/modules/run-virt/data/opt/openslx') diff --git a/core/modules/run-virt/data/opt/openslx/scripts/systemd-run_virt_env b/core/modules/run-virt/data/opt/openslx/scripts/systemd-run_virt_env index 6c7136c5..8306c2b1 100755 --- a/core/modules/run-virt/data/opt/openslx/scripts/systemd-run_virt_env +++ b/core/modules/run-virt/data/opt/openslx/scripts/systemd-run_virt_env @@ -1,15 +1,16 @@ #!/bin/ash # ----------------------------------------------------------------------------- -# Copyright (c) 2007..2016 - RZ Uni FR -# Copyright (c) 2007..2016 - OpenSLX GmbH # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# Copyright (c) 2007..2018 bwLehrpool-Projektteam # -# If you have any feedback please consult http://openslx.org/feedback and -# send your suggestions, praise, or complaints to feedback@openslx.org +# 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 bwlehrpool@hs-offenburg.de. +# +# General information about bwLehrpool can be found at https://bwlehrpool.de # -# General information about OpenSLX can be found at http://openslx.org/ # ----------------------------------------------------------------------------- # systemd-vmchooser_env # - This is the preparation script for the configuration of the virtuali- diff --git a/core/modules/run-virt/data/opt/openslx/scripts/vmchooser-xml_filter b/core/modules/run-virt/data/opt/openslx/scripts/vmchooser-xml_filter index 5fd8acc5..4914c6c0 100755 --- a/core/modules/run-virt/data/opt/openslx/scripts/vmchooser-xml_filter +++ b/core/modules/run-virt/data/opt/openslx/scripts/vmchooser-xml_filter @@ -1,16 +1,17 @@ #!/bin/bash # Probably needs bash somewhere # ----------------------------------------------------------------------------- -# Copyright (c) 2007..2009 - RZ Uni FR -# Copyright (c) 2007..2011 - OpenSLX GmbH # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# Copyright (c) 2007..2018 bwLehrpool-Projektteam # -# If you have any feedback please consult http://openslx.org/feedback and -# send your suggestions, praise, or complaints to feedback@openslx.org +# 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 bwlehrpool@hs-offenburg.de. +# +# General information about bwLehrpool can be found at https://bwlehrpool.de # -# General information about OpenSLX can be found at http://openslx.org/ # ----------------------------------------------------------------------------- # xmlfilter.sh # - This script is invoked by the vmchooser tool. It simply filters xml- diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/config/smb.conf b/core/modules/run-virt/data/opt/openslx/vmchooser/config/smb.conf index d8966f71..016ca2f3 100644 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/config/smb.conf +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/config/smb.conf @@ -1,13 +1,15 @@ # ----------------------------------------------------------------------------- -# Copyright (c) 2009..2013 - OpenSLX GmbH +# +# Copyright (c) 2009..2018 bwLehrpool-Projektteam # # This program/file is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# 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 bwlehrpool@hs-offenburg.de. # -# If you have any feedback please consult http://openslx.org/feedback and -# send your feedback to feedback@openslx.org +# General information about bwLehrpool can be found at https://bwlehrpool.de # -# General information about OpenSLX can be found at http://openslx.org # ----------------------------------------------------------------------------- # smb.conf # - basic samba configuration file for OpenSLX host-internal networking diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/config/udhcpd-nat1.conf b/core/modules/run-virt/data/opt/openslx/vmchooser/config/udhcpd-nat1.conf index 27aa63c3..f3a6fbe0 100644 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/config/udhcpd-nat1.conf +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/config/udhcpd-nat1.conf @@ -1,12 +1,15 @@ -# Copyright (c) 2013 - OpenSLX GmbH -# -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING -# -# If you have any feedback please consult http://openslx.org/feedback and -# send your suggestions, praise, or complaints to feedback@openslx.org -# -# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# +# 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 bwlehrpool@hs-offenburg.de. +# +# General information about bwLehrpool can be found at https://bwlehrpool.de +# # ----------------------------------------------------------------------------- # udhcpd.conf # - This is the udhcpd configuration file servicing the nat1 interface for diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc index 8d004f48..4b31d16a 100755 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc @@ -121,32 +121,5 @@ function mount_share() ### Funktionen Mounter Ende ####################### -### Funktionen resolution ######################### - -get_xauthfile() -{ - # Das ist mitunter ein Problem, da die richtige xauth zu finden - Distroabhängig! - for wartezeit in 1 2 3 5 10 10 0 ende; do - [ "$wartezeit" = "ende" ] && { logger "openslx resolution utility: XAUTHFILE not found. Exiting."; exit 1; } - XAUTHORITY=$(ps aux | grep -o "root.*X.* \-auth *[^ ]*" | awk '{print $NF}') - [ -n "${XAUTHORITY}" ] && break - sleep $wartezeit - done - logger "openslx resolution utility: XAUTHFILE found." -} - - -check_resolution() { - ACTRES=$(DISPLAY="${DISPLAY}" XAUTHORITY="${XAUTHORITY}" xrandr|grep '*'|tr -s " "|cut -f 2 -d " ") - if [ "$ACTRES" != "$RESOLUTION" ]; then - logger "openslx resolution utility: resolution changed; re-changing." - DISPLAY="${DISPLAY}" XAUTHORITY="${XAUTHORITY}" xrandr --output ${AUSGABE} --mode ${RESOLUTION} - else - logger "openslx resolution utility: resolution unchanged." - fi -} - -### Funktionen resolution Ende #################### - ### Funktionen Ende ############################### diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/60_resolution.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/60_resolution.inc index cdb895bf..86de6096 100755 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/60_resolution.inc +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/60_resolution.inc @@ -1,6 +1,29 @@ +get_xauthfile() +{ + # Das ist mitunter ein Problem, da die richtige xauth zu finden - Distroabhängig! + for wartezeit in 1 2 3 5 10 10 0 ende; do + [ "$wartezeit" = "ende" ] && { logger "openslx resolution utility: XAUTHFILE not found. Exiting."; exit 1; } + XAUTHORITY=$(ps aux | grep -o "root.*X.* \-auth *[^ ]*" | awk '{print $NF}') + [ -n "${XAUTHORITY}" ] && break + sleep $wartezeit + done + logger "openslx resolution utility: XAUTHFILE found." +} + + +check_resolution() { + ACTRES=$(DISPLAY="${DISPLAY}" XAUTHORITY="${XAUTHORITY}" xrandr|grep '*'|tr -s " "|cut -f 2 -d " ") + if [ "$ACTRES" != "$RESOLUTION" ]; then + logger "openslx resolution utility: resolution changed; re-changing." + DISPLAY="${DISPLAY}" XAUTHORITY="${XAUTHORITY}" xrandr --output ${AUSGABE} --mode ${RESOLUTION} + else + logger "openslx resolution utility: resolution unchanged." + fi +} + set_resolution() { - DISPLAY="${1}.0" + DISPLAY="${1}.0" logger "openslx resolution utility started." # Da nun fremdgemountet wird, hier sicherheitshalber zur Kontrolle wg. Gross-/Kleinschreibung: diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/resolution b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/resolution index 162f4d08..84775db7 100755 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/resolution +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/resolution @@ -7,6 +7,10 @@ # Zu erledigen: Jede Menge, zB anständiges Trapping, Fehler abfangen usw... # set -x +OWNDIR=$(dirname $0) +source "$(dirname $0)"/includes/00_vars.inc +source "$(dirname $0)"/includes/60_resolution.inc + DISPLAY=:0.0 logger "openslx resolution utility started." @@ -39,7 +43,7 @@ logger "openslx resolution utility: XAUTHFILE found." # Zu verbessern: Der Name des Verbundenen ist nicht immer bekannt. Daher nehmen wir das # erste 'connected' in der Ausgabe xrandrs Und warten evtl. ein Weilchen):: -for wartezeit in 1 1 1 2 0 ende; do +for wartezeit in 1 1 1 2 2 2 4 4 8 8 0 ende; do [ "$wartezeit" = "ende" ] && { logger "openslx resolution utility: Could not detect output device. Exiting." ; exit 1; } AUSGABE=$(DISPLAY="${DISPLAY}" XAUTHORITY="${XAUTHORITY}" xrandr -q|grep -m 1 " connected "|awk '{print $1}') [ -n "$AUSGABE" ] && break diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt b/core/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt index b0832aa3..52ded248 100755 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt @@ -1,16 +1,17 @@ #!/bin/bash # Full bash required # ----------------------------------------------------------------------------- -# Copyright (c) 2007..2016 - RZ Uni FR -# Copyright (c) 2007..2016 - OpenSLX GmbH # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# Copyright (c) 2007..2018 bwLehrpool-Projektteam # -# If you have any feedback please consult http://openslx.org/feedback and -# send your suggestions, praise, or complaints to feedback@openslx.org +# 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 bwlehrpool@hs-offenburg.de. +# +# General information about bwLehrpool can be found at https://bwlehrpool.de # -# General information about OpenSLX can be found at http://openslx.org/ # ----------------------------------------------------------------------------- # run-virt.sh # - This is the generic wrapper for the several virtualization solutions. -- cgit v1.2.3-55-g7522