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 --- core/bin/setup_target | 13 ++++++----- core/includes/chroot.inc | 13 ++++++----- core/includes/cleanup.inc | 13 ++++++----- .../data/opt/openslx/scripts/udhcpc-openslx | 13 ++++++----- .../gdisk/data/inc/prepare_localhd.functions | 14 ++++++----- .../gdisk/data/inc/setup_gpt.differentapproach | 25 ++++++++++---------- core/modules/gdisk/data/inc/setup_gpt.old | 17 +++++++++----- .../data/opt/openslx/scripts/systemd-qemukvm_env | 12 ++++++---- .../qemukvm/includes/finalize_start_command.inc | 12 ++++++---- .../plugins/qemukvm/includes/init_core.inc | 12 ++++++---- .../vmchooser/plugins/qemukvm/run-virt.include | 15 ++++++------ .../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 ++++++------ .../data/opt/openslx/scripts/openslx-create_issue | 17 ++++++++------ .../data/opt/openslx/scripts/systemd-vbox_env | 15 ++++++------ .../vmchooser/plugins/virtualbox/run-virt.include | 13 ++++++----- .../vbox/data/opt/openslx/scripts/systemd-vbox_env | 15 ++++++------ .../vmchooser/plugins/virtualbox/machine.include | 12 ++++++---- .../vmchooser/plugins/virtualbox/run-virt.include | 13 ++++++----- .../plugins/virtualbox/virtualbox.include | 12 ++++++---- .../data/opt/openslx/scripts/systemd-vmware_env | 14 ++++++----- .../vmchooser/plugins/vmware/run-virt.include | 15 ++++++------ .../data/opt/openslx/scripts/systemd-vmware_env | 14 ++++++----- .../vmchooser/plugins/vmware/run-virt.include | 15 ++++++------ core/rootfs/rootfs-stage31/data/init | 17 ++++++++------ .../opt/openslx/scripts/systemd-setup_partitions | 16 ++++++++----- .../data/opt/openslx/scripts/systemd-zram_swap | 16 ++++++++----- 33 files changed, 276 insertions(+), 223 deletions(-) (limited to 'core') diff --git a/core/bin/setup_target b/core/bin/setup_target index 365f24db..8e683e95 100755 --- a/core/bin/setup_target +++ b/core/bin/setup_target @@ -1,15 +1,16 @@ #!/bin/bash # ----------------------------------------------------------------------------- # -# Copyright (c) 2011..2016 - OpenSLX GmbH +# Copyright (c) 2011..2018 bwLehrpool-Projektteam # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# 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 http://openslx.org/feedback and -# send your suggestions, praise, or complaints to feedback@openslx.org +# 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/ # ----------------------------------------------------------------------------- # # This file contains the functions needed to setup a target. diff --git a/core/includes/chroot.inc b/core/includes/chroot.inc index 3dba18a3..c6d0a1fc 100644 --- a/core/includes/chroot.inc +++ b/core/includes/chroot.inc @@ -1,15 +1,16 @@ #!/bin/bash # ----------------------------------------------------------------------------- # -# Copyright (c) 2014 - OpenSLX GmbH +# Copyright (c) 2014..2018 bwLehrpool-Projektteam # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# 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 http://openslx.org/feedback and -# send your suggestions, praise, or complaints to feedback@openslx.org +# 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/ # ----------------------------------------------------------------------------- # # Common functions for chrooting diff --git a/core/includes/cleanup.inc b/core/includes/cleanup.inc index 17e9446d..20c01ea7 100644 --- a/core/includes/cleanup.inc +++ b/core/includes/cleanup.inc @@ -1,15 +1,16 @@ #!/bin/bash # ----------------------------------------------------------------------------- # -# Copyright (c) 2014 - OpenSLX GmbH +# Copyright (c) 2014..2018 bwLehrpool-Projektteam # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# 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 http://openslx.org/feedback and -# send your suggestions, praise, or complaints to feedback@openslx.org +# 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/ # ----------------------------------------------------------------------------- # # Trapped cleanup functions diff --git a/core/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx b/core/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx index 28682112..55a04587 100755 --- a/core/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx +++ b/core/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx @@ -2,15 +2,16 @@ # Needs bash for printf -v VARNAME # ----------------------------------------------------------------------------- # -# Copyright (c) 2011 - OpenSLX GmbH +# Copyright (c) 2011..2018 bwLehrpool-Projektteam # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# 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 http://openslx.org/feedback and -# send your suggestions, praise, or complaints to feedback@openslx.org +# 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/ # ----------------------------------------------------------------------------- # # Mini-Linux Toolkit diff --git a/core/modules/gdisk/data/inc/prepare_localhd.functions b/core/modules/gdisk/data/inc/prepare_localhd.functions index 45075ab0..50ac0a70 100755 --- a/core/modules/gdisk/data/inc/prepare_localhd.functions +++ b/core/modules/gdisk/data/inc/prepare_localhd.functions @@ -1,13 +1,15 @@ #!/bin/ash -# Copyright (c) 2014 - OpenSLX GmbH +# ----------------------------------------------------------------------------- # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# Copyright (c) 2014..2018 bwLehrpool-Projektteam # -# If you have any feedback please consult http://openslx.org/feedback and -# send your feedback 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 # -# General information about OpenSLX can be found under http://openslx.org +# 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 # # Local hard disk autodetection script for OpenSLX linux stateless clients, # detecting special GPT partitions diff --git a/core/modules/gdisk/data/inc/setup_gpt.differentapproach b/core/modules/gdisk/data/inc/setup_gpt.differentapproach index 25b8dda3..aa809529 100755 --- a/core/modules/gdisk/data/inc/setup_gpt.differentapproach +++ b/core/modules/gdisk/data/inc/setup_gpt.differentapproach @@ -1,24 +1,23 @@ #!/bin/ash -# Copyright (c) 2014 - OpenSLX GmbH +# ----------------------------------------------------------------------------- # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# Copyright (c) 2014..2018 bwLehrpool-Projektteam # -# If you have any feedback please consult http://openslx.org/feedback and -# send your feedback 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 # -# General information about OpenSLX can be found under http://openslx.org +# If you have any feedback please consult https://bwlehrpool.de and +# send your feedback to bwlehrpool@hs-offenburg.de. # -# Local hard disk autodetection script for OpenSLX linux stateless clients, -# detecting special GPT partitions - -############################################################################# +# General information about bwLehrpool can be found at https://bwlehrpool.de +# +# ----------------------------------------------------------------------------- -# Patition IDs -# Prefix for all paritions is 0FC63DAF-8483-4772-8E79-9999999999 +# Partition IDs +# Prefix for all partitions is 0FC63DAF-8483-4772-8E79-9999999999 # Suffix: # 44: non-persistent scratch partition -# 45: persistent partiton +# 45: persistent partition # 46: non-persistent openslx partition for config, overlayfs and qcow images # We use special non assigned partition type for harddisk scratch diff --git a/core/modules/gdisk/data/inc/setup_gpt.old b/core/modules/gdisk/data/inc/setup_gpt.old index a4c971e4..29eada70 100755 --- a/core/modules/gdisk/data/inc/setup_gpt.old +++ b/core/modules/gdisk/data/inc/setup_gpt.old @@ -1,13 +1,18 @@ #!/bin/ash -# Copyright (c) 2013 - OpenSLX GmbH + +# ----------------------------------------------------------------------------- +# +# 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 # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# 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 under http://openslx.org +# ----------------------------------------------------------------------------- # # Local hard disk autodetection script for OpenSLX linux stateless clients, # detecting swap and special partitions diff --git a/core/modules/qemukvm/data/opt/openslx/scripts/systemd-qemukvm_env b/core/modules/qemukvm/data/opt/openslx/scripts/systemd-qemukvm_env index 03a138be..631c159f 100755 --- a/core/modules/qemukvm/data/opt/openslx/scripts/systemd-qemukvm_env +++ b/core/modules/qemukvm/data/opt/openslx/scripts/systemd-qemukvm_env @@ -1,14 +1,16 @@ #!/bin/ash # ----------------------------------------------------------------------------- -# Copyright (c) 2017 - OpenSLX GmbH +# +# Copyright (c) 2017..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 # ----------------------------------------------------------------------------- # systemd-qemukvm_env # - This is the preparation script for the configuration of Linux Qemu/KVM. diff --git a/core/modules/qemukvm/data/opt/openslx/vmchooser/plugins/qemukvm/includes/finalize_start_command.inc b/core/modules/qemukvm/data/opt/openslx/vmchooser/plugins/qemukvm/includes/finalize_start_command.inc index 348da296..a458f255 100644 --- a/core/modules/qemukvm/data/opt/openslx/vmchooser/plugins/qemukvm/includes/finalize_start_command.inc +++ b/core/modules/qemukvm/data/opt/openslx/vmchooser/plugins/qemukvm/includes/finalize_start_command.inc @@ -1,13 +1,15 @@ # ----------------------------------------------------------------------------- -# Copyright (c) 2009..2017 - 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 # ----------------------------------------------------------------------------- # run-virt.include # - Include script for running the QEMU/Linux KVM virtual machine on an diff --git a/core/modules/qemukvm/data/opt/openslx/vmchooser/plugins/qemukvm/includes/init_core.inc b/core/modules/qemukvm/data/opt/openslx/vmchooser/plugins/qemukvm/includes/init_core.inc index 0041d46e..7666bedd 100644 --- a/core/modules/qemukvm/data/opt/openslx/vmchooser/plugins/qemukvm/includes/init_core.inc +++ b/core/modules/qemukvm/data/opt/openslx/vmchooser/plugins/qemukvm/includes/init_core.inc @@ -1,13 +1,15 @@ # ----------------------------------------------------------------------------- -# Copyright (c) 2009..2017 - 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 # ----------------------------------------------------------------------------- # run-virt.include # - Include script for running the QEMU/Linux KVM virtual machine on an diff --git a/core/modules/qemukvm/data/opt/openslx/vmchooser/plugins/qemukvm/run-virt.include b/core/modules/qemukvm/data/opt/openslx/vmchooser/plugins/qemukvm/run-virt.include index 4e4811d4..7d1149b0 100644 --- a/core/modules/qemukvm/data/opt/openslx/vmchooser/plugins/qemukvm/run-virt.include +++ b/core/modules/qemukvm/data/opt/openslx/vmchooser/plugins/qemukvm/run-virt.include @@ -1,14 +1,15 @@ # ----------------------------------------------------------------------------- -# Copyright (c) 2009..2017 - RZ Uni Freiburg -# Copyright (c) 2009..2017 - OpenSLX GmbH # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# Copyright (c) 2009..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.include # - qemu/kvm plugin for vmchooser run-virt 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. diff --git a/core/modules/slx-issue/data/opt/openslx/scripts/openslx-create_issue b/core/modules/slx-issue/data/opt/openslx/scripts/openslx-create_issue index e2c78b28..f778b4ca 100755 --- a/core/modules/slx-issue/data/opt/openslx/scripts/openslx-create_issue +++ b/core/modules/slx-issue/data/opt/openslx/scripts/openslx-create_issue @@ -1,15 +1,18 @@ #!/bin/bash # Needs bash for string manipulation -# Copyright (c) 2013, 2014 - bwLehrpool Projekt -# Copyright (c) 2012 - OpenSLX GmbH +# ----------------------------------------------------------------------------- # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# Copyright (c) 2012..2018 bwLehrpool-Projektteam # -# If you have any feedback please consult http://openslx.org/feedback and -# send your feedback 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 # -# General information about OpenSLX can be found at http://openslx.org +# 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 +# +# ----------------------------------------------------------------------------- # # First script for initial ramfs for OpenSLX linux stateless clients ############################################################################# diff --git a/core/modules/vbox-src/data/opt/openslx/scripts/systemd-vbox_env b/core/modules/vbox-src/data/opt/openslx/scripts/systemd-vbox_env index 6e669a8a..e454ee15 100755 --- a/core/modules/vbox-src/data/opt/openslx/scripts/systemd-vbox_env +++ b/core/modules/vbox-src/data/opt/openslx/scripts/systemd-vbox_env @@ -1,15 +1,16 @@ #!/bin/ash # ----------------------------------------------------------------------------- -# Copyright (c) 2007..2013 - RZ Uni FR -# Copyright (c) 2007..2013 - 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-vbox_env # - This is the preparation script for the configuration of VirtualBox. diff --git a/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/run-virt.include b/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/run-virt.include index 30f492e5..023f692d 100755 --- a/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/run-virt.include +++ b/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/run-virt.include @@ -1,14 +1,15 @@ # ----------------------------------------------------------------------------- -# Copyright (c) 2009..2018 - RZ Uni Freiburg -# Copyright (c) 2009..2018 - 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 # ----------------------------------------------------------------------------- # run-virt.include # - component for virtualbox of the vmchooser plugin vmchooser-run_virt diff --git a/core/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env b/core/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env index a5a298ee..64e138e4 100755 --- a/core/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env +++ b/core/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env @@ -1,15 +1,16 @@ #!/bin/ash # ----------------------------------------------------------------------------- -# Copyright (c) 2007..2013 - RZ Uni FR -# Copyright (c) 2007..2013 - OpenSLX GmbH # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# Copyright (c) 2016..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-vbox_env # - This is the preparation script for the configuration of VirtualBox. diff --git a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/machine.include b/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/machine.include index bd14cdb0..532160d1 100644 --- a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/machine.include +++ b/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/machine.include @@ -1,13 +1,15 @@ # ----------------------------------------------------------------------------- -# Copyright (c) 2010..2012 - OpenSLX GmbH +# +# Copyright (c) 2010..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 # ----------------------------------------------------------------------------- # Include file (general template) for run-virt.include of the virtualbox plugin diff --git a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/run-virt.include b/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/run-virt.include index 8bec8446..df7772e8 100755 --- a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/run-virt.include +++ b/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/run-virt.include @@ -1,14 +1,15 @@ # ----------------------------------------------------------------------------- -# Copyright (c) 2009..2016 - RZ Uni Freiburg -# Copyright (c) 2009..2016 - 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 # ----------------------------------------------------------------------------- # run-virt.include # - component for virtualbox of the vmchooser plugin vmchooser-run_virt diff --git a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/virtualbox.include b/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/virtualbox.include index b4bb38e3..5da82b10 100644 --- a/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/virtualbox.include +++ b/core/modules/vbox/data/opt/openslx/vmchooser/plugins/virtualbox/virtualbox.include @@ -1,13 +1,15 @@ # ----------------------------------------------------------------------------- -# Copyright (c) 2010..2012 - OpenSLX GmbH +# +# Copyright (c) 2010..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 # ----------------------------------------------------------------------------- # Include file (general template) for run-virt.include of the virtualbox plugin diff --git a/core/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env b/core/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env index e77f8632..ff373365 100755 --- a/core/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env +++ b/core/modules/vmware/data/opt/openslx/scripts/systemd-vmware_env @@ -1,14 +1,16 @@ #!/bin/ash # ----------------------------------------------------------------------------- -# Copyright (c) 2013 - OpenSLX GmbH # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# Copyright (c) 2013..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-vmware_env # - This is the systemd configuration and provisioning script for the various diff --git a/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include b/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include index a552038b..e98595b7 100644 --- a/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include +++ b/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include @@ -1,14 +1,15 @@ # ----------------------------------------------------------------------------- -# Copyright (c) 2009..2017 - RZ Uni Freiburg -# Copyright (c) 2009..2017 - OpenSLX GmbH # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# Copyright (c) 2009..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.include # - component for vmware/player of the vmchooser plugin vmchooser-run_virt diff --git a/core/modules/vmware12/data/opt/openslx/scripts/systemd-vmware_env b/core/modules/vmware12/data/opt/openslx/scripts/systemd-vmware_env index b0249b38..a39cb1e6 100755 --- a/core/modules/vmware12/data/opt/openslx/scripts/systemd-vmware_env +++ b/core/modules/vmware12/data/opt/openslx/scripts/systemd-vmware_env @@ -1,14 +1,16 @@ #!/bin/ash # ----------------------------------------------------------------------------- -# Copyright (c) 2013 - OpenSLX GmbH # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# Copyright (c) 2013..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-vmware_env # - This is the systemd configuration and provisioning script for the various diff --git a/core/modules/vmware12/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include b/core/modules/vmware12/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include index a552038b..e98595b7 100644 --- a/core/modules/vmware12/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include +++ b/core/modules/vmware12/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include @@ -1,14 +1,15 @@ # ----------------------------------------------------------------------------- -# Copyright (c) 2009..2017 - RZ Uni Freiburg -# Copyright (c) 2009..2017 - OpenSLX GmbH # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# Copyright (c) 2009..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.include # - component for vmware/player of the vmchooser plugin vmchooser-run_virt diff --git a/core/rootfs/rootfs-stage31/data/init b/core/rootfs/rootfs-stage31/data/init index 2269014c..ad3b1fe5 100755 --- a/core/rootfs/rootfs-stage31/data/init +++ b/core/rootfs/rootfs-stage31/data/init @@ -1,14 +1,17 @@ #!/bin/ash -# Copyright (c) 2013, 2014 - bwLehrpool Projekt -# Copyright (c) 2012 - OpenSLX GmbH +# ----------------------------------------------------------------------------- # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# Copyright (c) 2012..2018 bwLehrpool-Projektteam # -# If you have any feedback please consult http://openslx.org/feedback and -# send your feedback 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 # -# General information about OpenSLX can be found at http://openslx.org +# 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 +# +# ----------------------------------------------------------------------------- # # First script for initial ramfs for OpenSLX linux stateless clients ############################################################################# diff --git a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions index 44693171..9b5abbe7 100755 --- a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions +++ b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions @@ -1,14 +1,18 @@ #!/bin/bash # Arrays etc and $(( )) with big numbers -# Copyright (c) 2018 - OpenSLX GmbH +# ----------------------------------------------------------------------------- # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# Copyright (c) 2018 bwLehrpool-Projektteam # -# If you have any feedback please consult http://openslx.org/feedback and -# send your feedback 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 # -# General information about OpenSLX can be found under http://openslx.org +# 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 +# +# ----------------------------------------------------------------------------- # # Local hard disk autodetection script for OpenSLX linux stateless clients, # detecting swap and special partitions 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 index b5f8a599..8c011d63 100755 --- a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-zram_swap +++ b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-zram_swap @@ -1,13 +1,17 @@ #!/bin/ash -# Copyright (c) 2013 - OpenSLX GmbH +# ----------------------------------------------------------------------------- # -# This program is free software distributed under the GPL version 2. -# See http://openslx.org/COPYING +# Copyright (c) 2013..2018 bwLehrpool-Projektteam # -# If you have any feedback please consult http://openslx.org/feedback and -# send your feedback 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 # -# General information about OpenSLX can be found under http://openslx.org +# 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 +# +# ----------------------------------------------------------------------------- # # Local hard disk autodetection script for OpenSLX linux stateless clients, # detecting swap and special partitions -- cgit v1.2.3-55-g7522