From 3aebd3516e346a0f5b3c6a08b8c488fff1939e2c Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 27 Apr 2021 12:06:31 +0200 Subject: [vmware-common] Increase OS HW limits, move VMware specific limits --- .../includes/determine_hardware_limitations.inc | 38 +++++++++++----------- .../plugins/vmware/includes/write_final_vmx.inc | 28 ++++++++++++---- 2 files changed, 40 insertions(+), 26 deletions(-) diff --git a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/determine_hardware_limitations.inc b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/determine_hardware_limitations.inc index b7c59819..f63a9ba1 100644 --- a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/determine_hardware_limitations.inc +++ b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/determine_hardware_limitations.inc @@ -67,7 +67,7 @@ set_vm_hardware_limits() { ;; winnet*64|win*2003*64|windowsnet*64) VM_OS_TYPE="winnetstandard-64" - MAXMEM="8000" + MAXMEM="16000" MAXCORES="8" ;; winnet*|win*2003*|windowsnet*) @@ -97,18 +97,18 @@ set_vm_hardware_limits() { ;; windows7-64) VM_OS_TYPE="windows7-64" - MAXMEM="32000" + MAXMEM="64000" MAXCORES="8" ;; windows8-64) VM_OS_TYPE="windows8-64" - MAXMEM="32000" - MAXCORES="8" + MAXMEM="128000" + MAXCORES="256" ;; windows9-64) VM_OS_TYPE="windows9-64" - MAXMEM="64000" - MAXCORES="8" + MAXMEM="512000" + MAXCORES="256" ;; winvista) VM_OS_TYPE="winvista" @@ -121,22 +121,20 @@ set_vm_hardware_limits() { MAXCORES="4" ;; windows8) - VM_OS_TYPE="windows8" MAXMEM="8000" - MAXCORES="4" + MAXCORES="32" ;; windows9) - VM_OS_TYPE="windows9" MAXMEM="8000" - MAXCORES="4" + MAXCORES="32" ;; win*64) - MAXMEM="16000" - MAXCORES="4" + MAXMEM="32000" + MAXCORES="32" ;; win*) MAXMEM="8000" - MAXCORES="1" + MAXCORES="32" ;; dos|msdos*|ms-dos*) VM_OS_TYPE="dos" @@ -147,25 +145,24 @@ set_vm_hardware_limits() { macos*64) VM_OS_TYPE="freebsd-64" MAXMEM="4000" - MAXCORES="2" + MAXCORES="8" ;; macos*) VM_OS_TYPE="freebsd" MAXMEM="4000" - MAXCORES="1" + MAXCORES="4" ;; beos*) VM_OS_TYPE="other" SHARED_FOLDERS="FALSE" + MAXCORES="16" ;; # Unknown guestOS setting in .xml - this encompasses linux too, # as there is a multitude of different distributions. Perhaps further # action will be needed if this leads to problems with exotic OSs. *64) - VM_OS_TYPE="other-64" - # SHARED_FOLDERS="FALSE" MAXMEM="123456" - MAXCORES="4" + MAXCORES="64" ;; *) VM_OS_TYPE="other" @@ -177,7 +174,10 @@ set_vm_hardware_limits() { declare -g CPU_CORES="${HW_THREADS:-1}" declare -rg HOST_CORE_COUNT="$CPU_CORES" - [ "$CPU_CORES" -gt "$MAXCORES" ] && CPU_CORES="$MAXCORES" + if (( CPU_CORES > MAXCORES )); then + writelog "Limiting vCPU count from $CPU_CORES to $MAXCORES because of guest OS" + CPU_CORES="$MAXCORES" + fi # It currently makes no sense to set the virtual number of cores # to a different value than the virtual number of cores per virtual CPU. diff --git a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc index 43738718..41f5840e 100644 --- a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc +++ b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc @@ -136,6 +136,20 @@ setup_serial() { # CPU and RAM setup_vcpu_ram() { #writelog "numvcpus = ${CPU_CORES} - maxvcpus=${HOST_CORE_COUNT}" + if (( VM_HW_VERSION < 18 && CPU_CORES > 16 )); then + writelog "Limiting VM to 16 cores since hwVersion < 18" + CPU_CORES=16 + elif (( CPU_CORES > 32 )); then + writelog "Limiting VM to 32 cores since it's the current maximum VMware supports" + CPU_CORES=32 + fi + if (( VM_HW_VERSION < 18 && VM_MEM > 65536 )); then + writelog "Limiting VM to 64GB since hwVersion < 18" + VM_MEM=65536 + elif (( VM_MEM > 131072 )); then + writelog "Limiting VM to 128GB since it's the current maximum VMware supports" + VM_MEM=131072 + fi cat >> "${TMPCONFIG}" <<-HEREEND numvcpus = "$CPU_CORES" cpuid.coresPerSocket = "$VM_CORES_PER_SOCKET" @@ -264,13 +278,6 @@ setup_graphics() { } finalize_hardware() { - # Apply $maxhardwareversion to final VMX - if notempty VM_HW_VERSION && [ "$VM_HW_VERSION" -gt "$maxhardwareversion" ]; then - writelog "Hardware version capped to $maxhardwareversion (was $VM_HW_VERSION)" - sed -i 's/^virtualHW\.version.*$/virtualHW.version = "'$maxhardwareversion'"/I' "${TMPCONFIG}" - VM_HW_VERSION="$maxhardwareversion" - fi - # Enable nested virtualization if not specified in remote vmx if [ -e "/run/hwinfo" ] && ! grep -qi '^vhv\.enable' "${TMPCONFIG}" \ && detect_cpu_flag "ept" "npt" \ @@ -294,6 +301,13 @@ finalize_hardware() { ## MAIN ## write_final_vmx() { + # Apply $maxhardwareversion to final VMX + if notempty VM_HW_VERSION && [ "$VM_HW_VERSION" -gt "$maxhardwareversion" ]; then + writelog "Hardware version capped to $maxhardwareversion (was $VM_HW_VERSION)" + sed -i 's/^virtualHW\.version.*$/virtualHW.version = "'$maxhardwareversion'"/I' "${TMPCONFIG}" + VM_HW_VERSION="$maxhardwareversion" + fi + replace_placeholders setup_ethernet setup_optical_drives -- cgit v1.2.3-55-g7522 From 24e52a3c38c027af438fe6dc0a577dd44202b4a0 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 27 Apr 2021 14:29:51 +0200 Subject: [run-virt] Honor SLX_PRINT_REUSE_PASSWORD for pwdaemon --- .../pam/hooks/auth-final-exec.d/99-pwdaemon-fallback.sh | 9 ++++++++- .../pam/hooks/auth-slx-source.d/99-run_virt_credentials | 11 +++++++++-- core/modules/run-virt/pw_daemon.c | 3 +++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/core/modules/run-virt/data/opt/openslx/pam/hooks/auth-final-exec.d/99-pwdaemon-fallback.sh b/core/modules/run-virt/data/opt/openslx/pam/hooks/auth-final-exec.d/99-pwdaemon-fallback.sh index e1347e41..6f86e0f8 100755 --- a/core/modules/run-virt/data/opt/openslx/pam/hooks/auth-final-exec.d/99-pwdaemon-fallback.sh +++ b/core/modules/run-virt/data/opt/openslx/pam/hooks/auth-final-exec.d/99-pwdaemon-fallback.sh @@ -1,5 +1,12 @@ #!/bin/ash -USERNAME="${PAM_USER}" PASSWORD="${USER_PASSWORD}" PWSOCKET="${TEMP_HOME_DIR}/.pwsocket" pwdaemon --daemon "${USER_UID}" +[ -z "${SLX_PXE_CLIENT_IP}${SLX_KCL_SERVERS}" ] && . /opt/openslx/config + +# Allow querying PW via UNIX Socket? +pw=0 +[ "$SLX_PRINT_REUSE_PASSWORD" = "yes" ] && pw=1 + +USERNAME="${PAM_USER}" PASSWORD="${USER_PASSWORD}" PWSOCKET="${TEMP_HOME_DIR}/.pwsocket" \ + LOCAL_PW="$pw" pwdaemon --daemon "${USER_UID}" exit 0 diff --git a/core/modules/run-virt/data/opt/openslx/pam/hooks/auth-slx-source.d/99-run_virt_credentials b/core/modules/run-virt/data/opt/openslx/pam/hooks/auth-slx-source.d/99-run_virt_credentials index 613c66ca..4611c461 100644 --- a/core/modules/run-virt/data/opt/openslx/pam/hooks/auth-slx-source.d/99-run_virt_credentials +++ b/core/modules/run-virt/data/opt/openslx/pam/hooks/auth-slx-source.d/99-run_virt_credentials @@ -64,8 +64,15 @@ if [ -n "$TEMP_HOME_DIR" ]; then fi fi fi - [ -n "$XDOMAIN" ] && XDOMAIN="$(echo "$XDOMAIN" | tr '[a-z]' '[A-Z]')\\" - USERNAME="${XDOMAIN}${XUSER}" PASSWORD="$PAM_AUTHTOK" PWSOCKET="${TEMP_HOME_DIR}/.pwsocket" pwdaemon --daemon "${USER_UID}" + [ -n "$XDOMAIN" ] && XDOMAIN="$(echo "$XDOMAIN" | tr 'a-z' 'A-Z')\\" + + [ -z "${SLX_PXE_CLIENT_IP}${SLX_KCL_SERVERS}" ] && . /opt/openslx/config + # Allow querying password via UNIX Socket? + pw=0 + [ "$SLX_PRINT_REUSE_PASSWORD" = "yes" ] && pw=1 + + USERNAME="${XDOMAIN}${XUSER}" PASSWORD="$PAM_AUTHTOK" PWSOCKET="${TEMP_HOME_DIR}/.pwsocket" \ + LOCAL_PW="$pw" pwdaemon --daemon "${USER_UID}" unset XUSER XDOMAIN fi fi diff --git a/core/modules/run-virt/pw_daemon.c b/core/modules/run-virt/pw_daemon.c index 0c9508a3..f25ffffc 100644 --- a/core/modules/run-virt/pw_daemon.c +++ b/core/modules/run-virt/pw_daemon.c @@ -149,7 +149,10 @@ static int mode_daemon(const uid_t uidNumber) const char *envuser = getenv("USERNAME"); volatile char *envpass = getenv("PASSWORD"); const char *pwsocket = getenv("PWSOCKET"); + const char *localstr = getenv("LOCAL_PW"); + int allowLocal = localstr != NULL && atoi(localstr); gid_t gidNumber = 65534; + memset(&addr, 0, sizeof(addr)); memset(&sig, 0, sizeof(sig)); if (envuser == NULL) { -- cgit v1.2.3-55-g7522 From f97d4a2ce86eea3e5600eebeaa1b6a3a4aeac4ec Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 27 Apr 2021 17:08:04 +0200 Subject: [xscreensaver] Revert to 5.40 6.00 is too broken as of now: * Hack randomly stops after standby * Hack/Saver turns invisible after display reconnect --- core/modules/xscreensaver/module.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/modules/xscreensaver/module.conf b/core/modules/xscreensaver/module.conf index 84d3ff24..cc67a903 100644 --- a/core/modules/xscreensaver/module.conf +++ b/core/modules/xscreensaver/module.conf @@ -2,15 +2,14 @@ REQUIRED_MODULES=" qt5core " +# Switch back to branch "openslx" once 6.x is fixed REQUIRED_GIT=" - git://git.openslx.org/openslx-ng/xscreensaver.git|openslx + git://git.openslx.org/openslx-ng/xscreensaver.git||bfe7aeb88fac24b git://git.openslx.org/openslx-ng/bwlp-screensaver.git " REQUIRED_PREFIX="/opt/openslx/bin" REQUIRED_BINARIES=" xscreensaver - xscreensaver-auth xscreensaver-command - xscreensaver-gfx bwlp-screensaver " -- cgit v1.2.3-55-g7522 From c9946eeb228ef39b8756970a19ec097a038a04df Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 27 Apr 2021 17:09:46 +0200 Subject: [kernel-vanilla] Add "Patch" for i915 on IVB_GT1 and Baytrail --- core/modules/kernel-vanilla/module.build | 1 + 1 file changed, 1 insertion(+) diff --git a/core/modules/kernel-vanilla/module.build b/core/modules/kernel-vanilla/module.build index f8d5f351..81eff22e 100644 --- a/core/modules/kernel-vanilla/module.build +++ b/core/modules/kernel-vanilla/module.build @@ -52,6 +52,7 @@ fetch_source() { git apply < "$patch" || perror "Could not apply $patch" echo "$patch" >> "patches-done" done + sed -i 's/batch_add(&cmds, 0xffff0000);/batch_add(\&cmds, 0xffff0000 | ((IS_IVB_GT1(i915) || IS_VALLEYVIEW(i915)) ? HIZ_RAW_STALL_OPT_DISABLE : 0));/' "drivers/gpu/drm/i915/gt/gen7_renderclear.c" || perror "Could not patch Ivybridge/Baytrail graphics." cd - # remember the current kernel version echo "${SYSTEM_KERNEL_LONG}" > ksrc/KVERSION -- cgit v1.2.3-55-g7522 From 3450ea7a4c51b535d357381d02649441127c1d78 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 27 Apr 2021 17:10:21 +0200 Subject: [kernel-vanilla] 5.10.32 --- core/modules/kernel-vanilla/module.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/modules/kernel-vanilla/module.conf b/core/modules/kernel-vanilla/module.conf index 2bae7757..62ece1a4 100644 --- a/core/modules/kernel-vanilla/module.conf +++ b/core/modules/kernel-vanilla/module.conf @@ -2,5 +2,5 @@ REQUIRED_BINARIES="" REQUIRED_LIBRARIES="" REQUIRED_DIRECTORIES="" -REQUIRED_KERNEL="5.4.54" +REQUIRED_KERNEL="5.10.32" REQUIRED_GIT="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git" -- cgit v1.2.3-55-g7522 From a6dd43dc578b9fd436f6c0d49f7affe7e6ce0c1b Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 27 Apr 2021 17:11:25 +0200 Subject: [vmware16] 16.1.1 --- core/modules/vmware16/module.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/modules/vmware16/module.conf b/core/modules/vmware16/module.conf index d9db93f1..43d40a36 100644 --- a/core/modules/vmware16/module.conf +++ b/core/modules/vmware16/module.conf @@ -1,5 +1,5 @@ #!/bin/bash -REQUIRED_VERSION="16.1.0" +REQUIRED_VERSION="16.1.1" REQUIRED_TYPE="workstation" REQUIRED_MODULES="kernel vmware-common" REQUIRED_DIRECTORIES=" -- cgit v1.2.3-55-g7522 From 94ff3de0630d96eea58db1cde7f0f7691794cfb8 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 27 Apr 2021 17:11:41 +0200 Subject: [vbox-src] 6.1.20 --- core/modules/vbox-src/module.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/modules/vbox-src/module.conf b/core/modules/vbox-src/module.conf index 989b16cd..28b6efc2 100644 --- a/core/modules/vbox-src/module.conf +++ b/core/modules/vbox-src/module.conf @@ -1,5 +1,5 @@ REQUIRED_MODULES="kernel" -REQUIRED_VBOX_VERSION="6.1.16" +REQUIRED_VBOX_VERSION="6.1.20" REQUIRED_DIRECTORIES=" /lib/modules /usr/lib/virtualbox -- cgit v1.2.3-55-g7522 From 78ad5a42f4d26d8341e83aa0bb7212219fba180e Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 27 Apr 2021 17:12:09 +0200 Subject: [kernel-vanilla] Improve aufs patch selection again --- core/modules/kernel-vanilla/module.build | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/core/modules/kernel-vanilla/module.build b/core/modules/kernel-vanilla/module.build index 81eff22e..9886640a 100644 --- a/core/modules/kernel-vanilla/module.build +++ b/core/modules/kernel-vanilla/module.build @@ -158,6 +158,7 @@ patch_aufs() { git clone "git://aufs.git.sourceforge.net/gitroot/aufs/${AUFS}-standalone.git" || perror "Cloning ${AUFS} failed." else git clone "git://github.com/sfjro/${AUFS}-standalone.git" || perror "Cloning ${AUFS} failed." + #git clone "git://github.com/bnied/${AUFS}-standalone.git" || perror "Cloning ${AUFS} failed." fi # get the needed version cde "${MODULE_WORK_DIR}/${AUFS}-standalone" @@ -167,16 +168,26 @@ patch_aufs() { if [ -z "$major" ] || [ -z "$minor" ]; then perror "REQUIRED_KERNEL not in properly set, this should not happen!" fi - local NEEDED_BRANCH="aufs${major}.${minor}" - local testvar - while [ "${patch}" -gt 0 ]; do - for testvar in "${branches[@]}"; do - if [ "$testvar" = "${NEEDED_BRANCH}.${patch}" ] || [ "$testvar" = "${NEEDED_BRANCH}.${patch}+" ]; then - NEEDED_BRANCH="$testvar" - break 2 - fi + local testvar outer NEEDED_BRANCH + while (( minor >= 0 )); do + NEEDED_BRANCH="aufs${major}.${minor}" + outer=false + while (( patch > 0 )); do + for testvar in "${branches[@]}"; do + if [ "$testvar" = "${NEEDED_BRANCH}.${patch}" ] || [ "$testvar" = "${NEEDED_BRANCH}.${patch}+" ]; then + NEEDED_BRANCH="$testvar" + break 3 + elif [ "$testvar" = "${NEEDED_BRANCH}" ]; then + outer=true + fi + done + (( patch-- )) done - patch=$(( patch - 1 )) + $outer && break + if (( patch == 0 )); then + patch=500 + (( minor-- )) + fi done pinfo "Getting branch origin/$NEEDED_BRANCH" git checkout "origin/$NEEDED_BRANCH" || git checkout "origin/${AUFS}.x-rcN" || perror "Could not checkout needed branch." -- cgit v1.2.3-55-g7522 From 073974dbb06a2501cd37e32db74d2ee0ee5859bb Mon Sep 17 00:00:00 2001 From: Steffen Ritter Date: Thu, 29 Apr 2021 13:10:44 +0200 Subject: Change the mail address for feedback in file headers * old address will be disabled in the future --- core/bin/setup_target | 2 +- core/includes/chroot.inc | 2 +- core/includes/cleanup.inc | 2 +- core/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx | 2 +- core/modules/gdisk/data/inc/prepare_localhd.functions | 2 +- core/modules/gdisk/data/inc/setup_gpt.differentapproach | 2 +- core/modules/gdisk/data/inc/setup_gpt.old | 2 +- core/modules/qemukvm/data/opt/openslx/scripts/systemd-qemukvm_env | 2 +- .../vmchooser/plugins/qemukvm/includes/finalize_start_command.inc | 2 +- .../data/opt/openslx/vmchooser/plugins/qemukvm/includes/init_core.inc | 2 +- .../qemukvm/data/opt/openslx/vmchooser/plugins/qemukvm/run-virt.include | 2 +- core/modules/run-virt/data/opt/openslx/scripts/systemd-run_virt_env | 2 +- core/modules/run-virt/data/opt/openslx/scripts/vmchooser-xml_filter | 2 +- core/modules/run-virt/data/opt/openslx/vmchooser/config/smb.conf | 2 +- .../data/opt/openslx/vmchooser/config/udhcpd-nat1.conf.template | 2 +- core/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt | 2 +- core/modules/slx-issue/data/opt/openslx/scripts/openslx-create_issue | 2 +- core/modules/vbox-src/data/opt/openslx/scripts/systemd-vbox_env | 2 +- .../data/opt/openslx/vmchooser/plugins/virtualbox/run-virt.include | 2 +- core/modules/vmware-common/data/opt/openslx/scripts/systemd-vmware_env | 2 +- .../data/opt/openslx/vmchooser/plugins/vmware/run-virt.include | 2 +- core/rootfs/rootfs-stage31/data/init | 2 +- .../rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions | 2 +- core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-zram_swap | 2 +- mltk | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/core/bin/setup_target b/core/bin/setup_target index e521592e..30fafbf5 100755 --- a/core/bin/setup_target +++ b/core/bin/setup_target @@ -7,7 +7,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # diff --git a/core/includes/chroot.inc b/core/includes/chroot.inc index 3782ab05..a35ca9b4 100644 --- a/core/includes/chroot.inc +++ b/core/includes/chroot.inc @@ -7,7 +7,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # diff --git a/core/includes/cleanup.inc b/core/includes/cleanup.inc index 20c01ea7..982c016b 100644 --- a/core/includes/cleanup.inc +++ b/core/includes/cleanup.inc @@ -7,7 +7,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # 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 960da782..c034efb5 100755 --- a/core/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx +++ b/core/modules/dhcpc-busybox/data/opt/openslx/scripts/udhcpc-openslx @@ -8,7 +8,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # diff --git a/core/modules/gdisk/data/inc/prepare_localhd.functions b/core/modules/gdisk/data/inc/prepare_localhd.functions index 50ac0a70..363c5083 100755 --- a/core/modules/gdisk/data/inc/prepare_localhd.functions +++ b/core/modules/gdisk/data/inc/prepare_localhd.functions @@ -7,7 +7,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # diff --git a/core/modules/gdisk/data/inc/setup_gpt.differentapproach b/core/modules/gdisk/data/inc/setup_gpt.differentapproach index aa809529..6f3013ee 100755 --- a/core/modules/gdisk/data/inc/setup_gpt.differentapproach +++ b/core/modules/gdisk/data/inc/setup_gpt.differentapproach @@ -7,7 +7,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # diff --git a/core/modules/gdisk/data/inc/setup_gpt.old b/core/modules/gdisk/data/inc/setup_gpt.old index 29eada70..96d92b1c 100755 --- a/core/modules/gdisk/data/inc/setup_gpt.old +++ b/core/modules/gdisk/data/inc/setup_gpt.old @@ -8,7 +8,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # 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 631c159f..7717394d 100755 --- a/core/modules/qemukvm/data/opt/openslx/scripts/systemd-qemukvm_env +++ b/core/modules/qemukvm/data/opt/openslx/scripts/systemd-qemukvm_env @@ -7,7 +7,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # 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 6d9df363..eff764fe 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 @@ -6,7 +6,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # 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 fee2cd1c..53f214bd 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 @@ -6,7 +6,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # 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 7d1149b0..a1a41499 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 @@ -6,7 +6,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # 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 ddcb81c5..6b79d0ec 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 @@ -7,7 +7,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # 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 4914c6c0..2d2df304 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 @@ -8,7 +8,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # 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 016ca2f3..95137377 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 @@ -6,7 +6,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/config/udhcpd-nat1.conf.template b/core/modules/run-virt/data/opt/openslx/vmchooser/config/udhcpd-nat1.conf.template index 19731d80..201804c3 100644 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/config/udhcpd-nat1.conf.template +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/config/udhcpd-nat1.conf.template @@ -6,7 +6,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # 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 8dac549d..2ba8424c 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 @@ -8,7 +8,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # 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 922830d2..416972ee 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 @@ -8,7 +8,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # 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 8f99ceb6..14cd3135 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 @@ -7,7 +7,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # 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 3ad81df5..adda65e3 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 @@ -6,7 +6,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # diff --git a/core/modules/vmware-common/data/opt/openslx/scripts/systemd-vmware_env b/core/modules/vmware-common/data/opt/openslx/scripts/systemd-vmware_env index f5ca0b99..b016a10e 100755 --- a/core/modules/vmware-common/data/opt/openslx/scripts/systemd-vmware_env +++ b/core/modules/vmware-common/data/opt/openslx/scripts/systemd-vmware_env @@ -7,7 +7,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # diff --git a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include index a59ea434..24debedd 100644 --- a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include +++ b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include @@ -6,7 +6,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # diff --git a/core/rootfs/rootfs-stage31/data/init b/core/rootfs/rootfs-stage31/data/init index 92790534..4615a4fb 100755 --- a/core/rootfs/rootfs-stage31/data/init +++ b/core/rootfs/rootfs-stage31/data/init @@ -7,7 +7,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # 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 5c579f05..e309ef84 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 @@ -8,7 +8,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # 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 8c011d63..413ce215 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 @@ -7,7 +7,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # diff --git a/mltk b/mltk index f51dd3b1..7e8159ad 100755 --- a/mltk +++ b/mltk @@ -9,7 +9,7 @@ # 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. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # -- cgit v1.2.3-55-g7522 From f0a14feede21071c0afc050c9174a86500dcf717 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 30 Apr 2021 15:43:47 +0200 Subject: [rootfs-stage32] Add more status output to setup-slx-addon --- .../rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons index 228474f2..91ec0d0b 100755 --- a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons +++ b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons @@ -98,12 +98,15 @@ fi # Run post-hook if available if [ -x "$ADDON_MOUNT_POINT/addon-init" ]; then + echo "Running post-append hook" "$ADDON_MOUNT_POINT/addon-init" || \ slxlog --echo "addon-setup-init" "Warning: Could not execute addon-init of $ADDON" fi if ! grep -q -F '/opt/openslx/mnt/stage4' '/proc/mounts'; then + echo "Running ldconfig" ldconfig 2> /dev/null || ldconfig.real 2> /dev/null fi +echo "Addon initialized." exit 0 -- cgit v1.2.3-55-g7522 From f858dbfea80197e1df1d45d3eaa3185fd4a09c3a Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 30 Apr 2021 15:59:52 +0200 Subject: [alsa] Don't treat missing /proc/asound as error Unless alsa isn't loaded, this just means we don't have a sound card. --- core/modules/alsa/data/opt/openslx/scripts/alsa-default_card | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/modules/alsa/data/opt/openslx/scripts/alsa-default_card b/core/modules/alsa/data/opt/openslx/scripts/alsa-default_card index b4522b7c..4e372f9c 100755 --- a/core/modules/alsa/data/opt/openslx/scripts/alsa-default_card +++ b/core/modules/alsa/data/opt/openslx/scripts/alsa-default_card @@ -3,8 +3,8 @@ PROC="/proc/asound/pcm" if [ ! -r "$PROC" ]; then - echo "'${PROC}' not found or not readable." - exit 1 + echo "'${PROC}' not found or not readable. Not setting default sound card." + exit 0 fi if [ -w "/etc" ]; then -- cgit v1.2.3-55-g7522 From 923a5910525cbf792418965892ab65457430a2bb Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 3 May 2021 14:09:30 +0200 Subject: [nvidia-libs] Whiteout list is optional, so no error --- core/modules/nvidia-libs/data/addon-init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/modules/nvidia-libs/data/addon-init b/core/modules/nvidia-libs/data/addon-init index 061bff6b..ae0734c2 100755 --- a/core/modules/nvidia-libs/data/addon-init +++ b/core/modules/nvidia-libs/data/addon-init @@ -1,6 +1,6 @@ #!/bin/ash -[ -e "/opt/openslx/etc/nvidia.whiteout" ] || exit 66 +[ -e "/opt/openslx/etc/nvidia.whiteout" ] || exit 0 while read line; do rm -f -- "$line" -- cgit v1.2.3-55-g7522