From affaf9125096a4ecbecd8fbd52c100b4f4d86275 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 12 Jul 2017 17:44:46 +0200
Subject: [*] systemd fixes cont.

---
 .../data/etc/systemd/system/cups.service.wants/printergui.service     | 1 +
 .../data/etc/systemd/system/network.target.wants/printergui.service   | 1 -
 core/modules/printergui/data/etc/systemd/system/printergui.service    | 2 --
 .../data/opt/openslx/scripts/systemd-printergui_preparation           | 4 ++--
 4 files changed, 3 insertions(+), 5 deletions(-)
 create mode 120000 core/modules/printergui/data/etc/systemd/system/cups.service.wants/printergui.service
 delete mode 120000 core/modules/printergui/data/etc/systemd/system/network.target.wants/printergui.service

(limited to 'core/modules/printergui')

diff --git a/core/modules/printergui/data/etc/systemd/system/cups.service.wants/printergui.service b/core/modules/printergui/data/etc/systemd/system/cups.service.wants/printergui.service
new file mode 120000
index 00000000..40453c80
--- /dev/null
+++ b/core/modules/printergui/data/etc/systemd/system/cups.service.wants/printergui.service
@@ -0,0 +1 @@
+../printergui.service
\ No newline at end of file
diff --git a/core/modules/printergui/data/etc/systemd/system/network.target.wants/printergui.service b/core/modules/printergui/data/etc/systemd/system/network.target.wants/printergui.service
deleted file mode 120000
index 40453c80..00000000
--- a/core/modules/printergui/data/etc/systemd/system/network.target.wants/printergui.service
+++ /dev/null
@@ -1 +0,0 @@
-../printergui.service
\ No newline at end of file
diff --git a/core/modules/printergui/data/etc/systemd/system/printergui.service b/core/modules/printergui/data/etc/systemd/system/printergui.service
index 56be00a2..24162565 100644
--- a/core/modules/printergui/data/etc/systemd/system/printergui.service
+++ b/core/modules/printergui/data/etc/systemd/system/printergui.service
@@ -1,7 +1,5 @@
 [Unit]
 Description=Printergui - bwLehrpool printing system
-Requires=network.target graphical.target
-After=network.target stage4.target
 Before=cups.service
 
 [Service]
diff --git a/core/modules/printergui/data/opt/openslx/scripts/systemd-printergui_preparation b/core/modules/printergui/data/opt/openslx/scripts/systemd-printergui_preparation
index 33a861e6..29971666 100755
--- a/core/modules/printergui/data/opt/openslx/scripts/systemd-printergui_preparation
+++ b/core/modules/printergui/data/opt/openslx/scripts/systemd-printergui_preparation
@@ -9,11 +9,11 @@ if [ ! -d "$DESTDIR" ]; then
 	mkdir -p "$DESTDIR" || exit 1
 fi
 
-mv "$SRCDIR"/* "$DESTDIR"
+mv -n "$SRCDIR"/* "$DESTDIR"
 
 cd "$SRCDIR"
 for i in "$DESTDIR"/*; do
-        ln -sf "$PRINTPWGUI" $(basename "$i")
+        ln -s "$PRINTPWGUI" $(basename "$i")
 done
 
 exit 0
-- 
cgit v1.2.3-55-g7522