summaryrefslogtreecommitdiffstats
path: root/remote
diff options
context:
space:
mode:
authorJonathan Bauer2014-07-02 15:57:24 +0200
committerJonathan Bauer2014-07-02 15:57:24 +0200
commitd01da409c69a021f7511f46c206a884cbeed2d2b (patch)
tree7f5d8d53865c089c16d6810e8afe2fe79da455a1 /remote
parent[rfs-s31] linking bb applets breaks some stage4's binaries (diff)
downloadtm-scripts-d01da409c69a021f7511f46c206a884cbeed2d2b.tar.gz
tm-scripts-d01da409c69a021f7511f46c206a884cbeed2d2b.tar.xz
tm-scripts-d01da409c69a021f7511f46c206a884cbeed2d2b.zip
remove hardcoded /bin/rm call. Relative calls work in services files
Diffstat (limited to 'remote')
-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 00b721f2..760af82f 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=-/bin/rm -f /var/run/dbus/pid
+ExecStartPre=-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 9226f00c..edbfd9ed 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=/bin/rm /run/udhcpc/udhcpc.%I.pid
+ExecStopPost=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 8f737395..bd1cd334 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=/bin/rm /var/run/dnbd3.socket
+ExecStopPost=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 a1c2b089..5d114476 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=/bin/rm -f /run/redsocks/redsocks.pid
-ExecStopPost=/bin/rm -f /opt/openslx/iptables/rules.d/10-redoscks-proxy
+ExecStopPost=rm -f /run/redsocks/redsocks.pid
+ExecStopPost=rm -f /opt/openslx/iptables/rules.d/10-redoscks-proxy
Restart=on-abort