Merge branch 'master' of dnbd3:openslx-ng/tm-scripts

18 files changed, 18 insertions, 18 deletions

diff --git a/remote/modules/debug/data/addon-init b/remote/modules/debug/data/addon-init
index bcccb23b..e83c21ba 100755
--- a/remote/modules/debug/data/addon-init
+++ b/remote/modules/debug/data/addon-init
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/ash
 
 systemctl daemon-reload
 systemctl start debug-shell.service
diff --git a/remote/modules/debug/data/opt/openslx/bin/debug_report b/remote/modules/debug/data/opt/openslx/bin/debug_report
index 2c3aabe4..4cdfae4e 100755
--- a/remote/modules/debug/data/opt/openslx/bin/debug_report
+++ b/remote/modules/debug/data/opt/openslx/bin/debug_report
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/ash
 
 TOOLS="
 	journalctl
diff --git a/remote/modules/debug/data/opt/openslx/scripts/systemd-debug_udevd_logger b/remote/modules/debug/data/opt/openslx/scripts/systemd-debug_udevd_logger
index 8b772517..fb04d568 100755
--- a/remote/modules/debug/data/opt/openslx/scripts/systemd-debug_udevd_logger
+++ b/remote/modules/debug/data/opt/openslx/scripts/systemd-debug_udevd_logger
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/bin/ash
 /usr/bin/udevadm monitor | /usr/bin/logger
diff --git a/remote/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3 b/remote/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3
index d41fe57e..c6e9d982 100755
--- a/remote/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3
+++ b/remote/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/ash
 
 if ! insmod /lib/modules/dnbd3/dnbd3.ko; then
 	slxlog "dnbd3-kernel" "Error loading dnbd3 client kernel module"
diff --git a/remote/modules/german/data/opt/openslx/scripts/systemd-load_german_keymaps b/remote/modules/german/data/opt/openslx/scripts/systemd-load_german_keymaps
index c7dbbb33..72c58f5f 100755
--- a/remote/modules/german/data/opt/openslx/scripts/systemd-load_german_keymaps
+++ b/remote/modules/german/data/opt/openslx/scripts/systemd-load_german_keymaps
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/ash
 # Script serves as container script for a systemd-call due to the buggyness of several
 # loadkeys-implementations <= kbd (Linux keyboard tools) 1.15.3.
 # This bug can be detected through failure of the command pipe 'dumpkeys|loadkeys' yielding
diff --git a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close
index 3a617d49..4d26d685 100755
--- a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close
+++ b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_close
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/ash
 
 # Needed as pam_script clears PATH
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"
diff --git a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
index 0d976b9f..63fb3413 100755
--- a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
+++ b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/ash
 
 # Needed as pam_script clears PATH
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"
diff --git a/remote/modules/redsocks/data/opt/openslx/scripts/systemd-setup_proxy b/remote/modules/redsocks/data/opt/openslx/scripts/systemd-setup_proxy
index 60606148..675f12cd 100755
--- a/remote/modules/redsocks/data/opt/openslx/scripts/systemd-setup_proxy
+++ b/remote/modules/redsocks/data/opt/openslx/scripts/systemd-setup_proxy
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/ash
 
 for wait in 1 1 2 3 4 6 8 10 end; do
 	grep '^#_RCONFIG_TAG$' /opt/openslx/config > /dev/null && echo "Config found!" && break
diff --git a/remote/modules/systemd/data/opt/openslx/scripts/systemd-shutdown_prescript b/remote/modules/systemd/data/opt/openslx/scripts/systemd-shutdown_prescript
index 9918d866..3b5d7f92 100755
--- a/remote/modules/systemd/data/opt/openslx/scripts/systemd-shutdown_prescript
+++ b/remote/modules/systemd/data/opt/openslx/scripts/systemd-shutdown_prescript
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/ash
 
 # This script gets called by ExecStartPre from the services 
 # systemd-halt, systemd-poweroff, systemd-reboot. Pre-shutdown actions as
diff --git a/remote/modules/vbox/data/addon-init b/remote/modules/vbox/data/addon-init
index d3c3fa47..825203c0 100755
--- a/remote/modules/vbox/data/addon-init
+++ b/remote/modules/vbox/data/addon-init
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/ash
 
 addgroup vboxusers
 nscd -i group
diff --git a/remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env b/remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env
index a4d10cbf..9b1d8489 100755
--- a/remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env
+++ b/remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/ash
 # Copyright (c) 2009 - OpenSLX GmbH 
 # 
 # This program is free software distributed under the GPL version 2. 
diff --git a/remote/modules/vmchooser/data/opt/openslx/bin/clc.bash b/remote/modules/vmchooser/data/opt/openslx/bin/clc.bash
index f5c989f4..7437c8d2 100755
--- a/remote/modules/vmchooser/data/opt/openslx/bin/clc.bash
+++ b/remote/modules/vmchooser/data/opt/openslx/bin/clc.bash
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/ash
 
 # region header
 
diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-mount_vm_store b/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-mount_vm_store
index 0c1b3fad..831e25d8 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-mount_vm_store
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-mount_vm_store
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/ash
 
 . /opt/openslx/config || exit 1
 
diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-vmchooser_env b/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-vmchooser_env
index 167f1a96..6facfa2d 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-vmchooser_env
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-vmchooser_env
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/ash
 
 export PATH=$PATH:/opt/openslx/bin:/opt/openslx/sbin:/opt/openslx/usr/bin:/opt/openslx/usr/sbin
 
diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter
index 960d1358..15e4b8d7 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-xml_filter
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/ash
 # -----------------------------------------------------------------------------
 # Copyright (c) 2007..2009 - RZ Uni FR
 # Copyright (c) 2007..2011 - OpenSLX GmbH
diff --git a/remote/modules/vmware/data/addon-init b/remote/modules/vmware/data/addon-init
index 01acb3b4..f76842d9 100755
--- a/remote/modules/vmware/data/addon-init
+++ b/remote/modules/vmware/data/addon-init
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/ash
 
 systemctl daemon-reload
 systemctl start vmware
diff --git a/remote/modules/vmware/data/opt/openslx/bin/vmplayer b/remote/modules/vmware/data/opt/openslx/bin/vmplayer
index 0f7d9232..cfb91a0a 100755
--- a/remote/modules/vmware/data/opt/openslx/bin/vmplayer
+++ b/remote/modules/vmware/data/opt/openslx/bin/vmplayer
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/ash
 # radically simplified version of the original script vmplayer by VMware Inc.
 PREFIX=/usr/lib/vmware # depends on the vmware location
 
diff --git a/remote/modules/xorg/data/etc/X11/Xsession b/remote/modules/xorg/data/etc/X11/Xsession
index 5734d8c4..15867190 100644
--- a/remote/modules/xorg/data/etc/X11/Xsession
+++ b/remote/modules/xorg/data/etc/X11/Xsession
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/ash
 
 #Workaround to start Xsession. The original Xsession script includes error handling functionality and sources other scrips from the Xsession.d/ directory.