diff options
| -rw-r--r-- | core/modules/cups/data/etc/systemd/system/cups.service | 2 | ||||
| l--------- | core/modules/printergui/data/etc/systemd/system/cups.service.wants/printergui.service (renamed from core/modules/printergui/data/etc/systemd/system/network.target.wants/printergui.service) | 0 | ||||
| -rw-r--r-- | core/modules/printergui/data/etc/systemd/system/printergui.service | 2 | ||||
| -rwxr-xr-x | core/modules/printergui/data/opt/openslx/scripts/systemd-printergui_preparation | 4 |
4 files changed, 2 insertions, 6 deletions
diff --git a/core/modules/cups/data/etc/systemd/system/cups.service b/core/modules/cups/data/etc/systemd/system/cups.service index a634804a..3902360f 100644 --- a/core/modules/cups/data/etc/systemd/system/cups.service +++ b/core/modules/cups/data/etc/systemd/system/cups.service @@ -1,8 +1,6 @@ [Unit] Description=Common Unix Printing System -Requires=network.target graphical.target After=network.target -Before=graphical.target ConditionFileNotEmpty=/etc/cups/printers.conf [Service] diff --git a/core/modules/printergui/data/etc/systemd/system/network.target.wants/printergui.service b/core/modules/printergui/data/etc/systemd/system/cups.service.wants/printergui.service index 40453c80..40453c80 120000 --- a/core/modules/printergui/data/etc/systemd/system/network.target.wants/printergui.service +++ b/core/modules/printergui/data/etc/systemd/system/cups.service.wants/printergui.service 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 |