adapted new naming conventions for all the scripts.

for our own systemd service files:
	use:	service-file-name.service
	ex:	/etc/systemd/system/setup-proxy.service

ALL systemd services files need to be under /etc/systemd/system

for our own scripts:
	use:	tool-what_it_does
	ex:	/opt/openslx/scripts/systemd-setup_proxy

ALL our scripts under /opt/openslx/scripts

11 files changed, 7 insertions, 8 deletions

diff --git a/remote/modules/debug/data/etc/systemd/system/debug-shell.service b/remote/modules/debug/data/etc/systemd/system/debug-shell.service
index fedd138d..6d50b3bd 100644
--- a/remote/modules/debug/data/etc/systemd/system/debug-shell.service
+++ b/remote/modules/debug/data/etc/systemd/system/debug-shell.service
@@ -12,7 +12,6 @@ DefaultDependencies=no
 IgnoreOnIsolate=yes
 
 [Service]
-Environment=TERM=linux PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin
 ExecStart=/bin/sh
 Restart=always
 RestartSec=0
diff --git a/remote/modules/german/data/etc/systemd/system/load-german-keymap.service b/remote/modules/german/data/etc/systemd/system/load-german-keymap.service
index e31406fb..c26346fe 100644
--- a/remote/modules/german/data/etc/systemd/system/load-german-keymap.service
+++ b/remote/modules/german/data/etc/systemd/system/load-german-keymap.service
@@ -7,4 +7,4 @@ Before=shutdown.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/opt/openslx/scripts/load_german_keymaps
+ExecStart=/opt/openslx/scripts/systemd-load_german_keymaps
diff --git a/remote/modules/german/data/opt/openslx/scripts/load_german_keymaps b/remote/modules/german/data/opt/openslx/scripts/systemd-load_german_keymaps
index c7dbbb33..c7dbbb33 100755
--- a/remote/modules/german/data/opt/openslx/scripts/load_german_keymaps
+++ b/remote/modules/german/data/opt/openslx/scripts/systemd-load_german_keymaps
diff --git a/remote/modules/redsocks/data/etc/systemd/system/basic.target.wants/setup-proxy.service b/remote/modules/redsocks/data/etc/systemd/system/basic.target.wants/setup-proxy.service
new file mode 120000
index 00000000..0da8d078
--- /dev/null
+++ b/remote/modules/redsocks/data/etc/systemd/system/basic.target.wants/setup-proxy.service
@@ -0,0 +1 @@
+../setup-proxy.service
\ No newline at end of file
diff --git a/remote/modules/redsocks/data/etc/systemd/system/basic.target.wants/setup_proxy.service b/remote/modules/redsocks/data/etc/systemd/system/basic.target.wants/setup_proxy.service
deleted file mode 120000
index 0c7dc84b..00000000
--- a/remote/modules/redsocks/data/etc/systemd/system/basic.target.wants/setup_proxy.service
+++ /dev/null
@@ -1 +0,0 @@
-../setup_proxy.service
\ No newline at end of file
diff --git a/remote/modules/redsocks/data/etc/systemd/system/setup_proxy.service b/remote/modules/redsocks/data/etc/systemd/system/setup-proxy.service
index 2a06058b..54052425 100644
--- a/remote/modules/redsocks/data/etc/systemd/system/setup_proxy.service
+++ b/remote/modules/redsocks/data/etc/systemd/system/setup-proxy.service
@@ -5,5 +5,5 @@ DefaultDependencies=no
 
 [Service]
 Type=oneshot
-ExecStart=/opt/openslx/scripts/setup_proxy
+ExecStart=/opt/openslx/scripts/systemd-setup_proxy
 RemainAfterExit=yes
diff --git a/remote/modules/redsocks/data/opt/openslx/scripts/setup_proxy b/remote/modules/redsocks/data/opt/openslx/scripts/systemd-setup_proxy
index 6c39c077..6c39c077 100755
--- a/remote/modules/redsocks/data/opt/openslx/scripts/setup_proxy
+++ b/remote/modules/redsocks/data/opt/openslx/scripts/systemd-setup_proxy
diff --git a/remote/modules/systemd/data/etc/systemd/system/nfs-mount.service b/remote/modules/systemd/data/etc/systemd/system/nfs-mount.service
index 0d537e2a..d597fa4b 100644
--- a/remote/modules/systemd/data/etc/systemd/system/nfs-mount.service
+++ b/remote/modules/systemd/data/etc/systemd/system/nfs-mount.service
@@ -4,4 +4,4 @@ Description=Mount NFS Share [TEST]
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/opt/openslx/scripts/mountexport
+ExecStart=/opt/openslx/scripts/systemd-mount_export
diff --git a/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service b/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service
index a7d6c324..0b198476 100644
--- a/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service
+++ b/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service
@@ -4,7 +4,7 @@ Description=DHCP Client
 [Service]
 Type=forking
 PIDFile=/run/udhcpc/udhcpc.%I.pid
-ExecStart=/opt/openslx/scripts/dhcp++ %I
+ExecStart=/opt/openslx/scripts/systemd-udhcpc++ %I
 ExecStopPost=/bin/rm /run/udhcpc/udhcpc.%I.pid
 
 [Install]
diff --git a/remote/modules/vmchooser/data/etc/systemd/system/var-lib-virt.service b/remote/modules/vmchooser/data/etc/systemd/system/var-lib-virt.service
index 8746629c..cfaa7af8 100644
--- a/remote/modules/vmchooser/data/etc/systemd/system/var-lib-virt.service
+++ b/remote/modules/vmchooser/data/etc/systemd/system/var-lib-virt.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Mount vm-store NFS
+Description=Mount VM store per NFS
 After=download-config.service network.target
 Requires=network.target
 DefaultDependencies=no
@@ -7,4 +7,4 @@ ConditionPathExists=/run/udhcpc/network-ready
 
 [Service]
 Type=oneshot
-ExecStart=/opt/openslx/bin/mount-lib-virt
+ExecStart=/opt/openslx/scripts/systemd-mount_vm_store
diff --git a/remote/modules/vmchooser/data/opt/openslx/bin/mount-lib-virt b/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-mount_vm_store
index 27a8f55c..27a8f55c 100755
--- a/remote/modules/vmchooser/data/opt/openslx/bin/mount-lib-virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/systemd-mount_vm_store