summaryrefslogtreecommitdiffstats
path: root/remote/modules
diff options
context:
space:
mode:
authorJonathan Bauer2014-07-04 14:27:33 +0200
committerJonathan Bauer2014-07-04 14:27:33 +0200
commiteb72a3fbf74f932f88ae204bd26298f22ee75a88 (patch)
tree30a7da6fea383d0b4060aea2776809b592a80a0f /remote/modules
parent[rfs-stage31] Source config right after fetching (diff)
downloadtm-scripts-eb72a3fbf74f932f88ae204bd26298f22ee75a88.tar.gz
tm-scripts-eb72a3fbf74f932f88ae204bd26298f22ee75a88.tar.xz
tm-scripts-eb72a3fbf74f932f88ae204bd26298f22ee75a88.zip
relative paths dont work with systemd-204
for now hardcoded /opt/openslx/bin/rm
Diffstat (limited to 'remote/modules')
-rw-r--r--remote/modules/dbus/templates/dbus.service2
-rw-r--r--remote/modules/dhcpc-busybox/data/etc/systemd/system/udhcpc@.service2
-rw-r--r--remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service2
-rw-r--r--remote/modules/redsocks/data/etc/systemd/system/redsocks.service4
4 files changed, 5 insertions, 5 deletions
diff --git a/remote/modules/dbus/templates/dbus.service b/remote/modules/dbus/templates/dbus.service
index 760af82f..c9f747b0 100644
--- a/remote/modules/dbus/templates/dbus.service
+++ b/remote/modules/dbus/templates/dbus.service
@@ -6,7 +6,7 @@ After=syslog.target
[Service]
%UUIDGEN%
-ExecStartPre=-rm -f /var/run/dbus/pid
+ExecStartPre=-/opt/openslx/bin/rm -f /var/run/dbus/pid
ExecStart=%DAEMON% --system --address=systemd: --nofork %DAEMON_ARGS%
ExecReload=%SEND% --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
OOMScoreAdjust=-900
diff --git a/remote/modules/dhcpc-busybox/data/etc/systemd/system/udhcpc@.service b/remote/modules/dhcpc-busybox/data/etc/systemd/system/udhcpc@.service
index edbfd9ed..6c2061a0 100644
--- a/remote/modules/dhcpc-busybox/data/etc/systemd/system/udhcpc@.service
+++ b/remote/modules/dhcpc-busybox/data/etc/systemd/system/udhcpc@.service
@@ -6,5 +6,5 @@ After=systemd-tmpfiles-setup.service
Type=forking
PIDFile=/run/udhcpc/udhcpc.%I.pid
ExecStart=/opt/openslx/scripts/systemd-udhcpc++ %I
-ExecStopPost=rm /run/udhcpc/udhcpc.%I.pid
+ExecStopPost=/opt/openslx/bin/rm /run/udhcpc/udhcpc.%I.pid
diff --git a/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service b/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
index bd1cd334..516cbfa2 100644
--- a/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
+++ b/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
@@ -7,5 +7,5 @@ DefaultDependencies=no
[Service]
ExecStart=/opt/openslx/scripts/systemd-setup_dnbd3
ExecStop=/opt/openslx/bin/dnbd3-client --kill
-ExecStopPost=rm /var/run/dnbd3.socket
+ExecStopPost=/opt/openslx/bin/rm /var/run/dnbd3.socket
Restart=on-abort
diff --git a/remote/modules/redsocks/data/etc/systemd/system/redsocks.service b/remote/modules/redsocks/data/etc/systemd/system/redsocks.service
index 5d114476..929c24ab 100644
--- a/remote/modules/redsocks/data/etc/systemd/system/redsocks.service
+++ b/remote/modules/redsocks/data/etc/systemd/system/redsocks.service
@@ -7,6 +7,6 @@ Type=forking
User=redsocks
PIDFile=/run/redsocks/redsocks.pid
ExecStart=/sbin/redsocks -c /etc/redsocks.conf -p /run/redsocks/redsocks.pid
-ExecStopPost=rm -f /run/redsocks/redsocks.pid
-ExecStopPost=rm -f /opt/openslx/iptables/rules.d/10-redoscks-proxy
+ExecStopPost=/opt/openslx/bin/rm -f /run/redsocks/redsocks.pid
+ExecStopPost=/opt/openslx/bin/rm -f /opt/openslx/iptables/rules.d/10-redoscks-proxy
Restart=on-abort