svc

commit 13b0827a98a76961bf39b8306ef3e2371967c55d
parent efe529f24617c52a4ed2145efaf9db33c8a2c6f6
Author: Christoph Lohmann <20h@r-36.net>
Date:   Wed,  5 Feb 2014 19:00:05 +0100

Moving the services over to /bin/svd.d too.

Diffstat:
svc.d/avail/alsa
 | 
2
+-
svc.d/avail/barebone
 | 
2
+-
svc.d/avail/fancontrol
 | 
2
+-
svc.d/avail/hwclock
 | 
2
+-
svc.d/avail/laptop-mode
 | 
2
+-
svc.d/avail/ntpd
 | 
2
+-
svc.d/avail/rfkill
 | 
2
+-
svc.d/avail/sensors
 | 
2
+-
svc.d/avail/sshd
 | 
2
+-
svc.d/avail/thinkfan
 | 
2
+-
svc.d/avail/wireless-regdom
 | 
2
+-
svc.d/run/acpid
 | 
2
--
svc.d/run/alsa
 | 
2
--
svc.d/run/atd
 | 
2
--
svc.d/run/crond
 | 
2
--
svc.d/run/dovecot
 | 
2
--
svc.d/run/gpsd
 | 
2
--
svc.d/run/hwclock
 | 
2
--
svc.d/run/laptop-mode
 | 
2
--
svc.d/run/nscd
 | 
2
--
svc.d/run/rfkill
 | 
2
--
svc.d/run/rfkilld
 | 
2
--
svc.d/run/sensors
 | 
2
--
svc.d/run/sshd
 | 
2
--
svc.d/run/syslog-ng
 | 
2
--
svc.d/run/wireless-regdom
 | 
2
--

26 files changed, 11 insertions(+), 41 deletions(-)
diff --git a/svc.d/avail/alsa b/svc.d/avail/alsa
@@ -2,7 +2,7 @@
 
 SERVICE="alsa"
 
-[ -e "/etc/svc/default/$SERVICE" ] && . "/etc/svc/default/$SERVICE"
+[ -e "/bin/svc.d/default/$SERVICE" ] && . "/bin/svc.d/default/$SERVICE"
 
 PID=$(pidof -o %PPID $BIN)
 
diff --git a/svc.d/avail/barebone b/svc.d/avail/barebone
@@ -2,7 +2,7 @@
 
 SERVICE="barebone"
 
-[ -e "/etc/svc/default/$SERVICE" ] && . "/etc/svc/default/$SERVICE"
+[ -e "/bin/svc.d/default/$SERVICE" ] && . "/bin/svc.d/default/$SERVICE"
 
 BIN="/usr/bin/$SERVICE"
 
diff --git a/svc.d/avail/fancontrol b/svc.d/avail/fancontrol
@@ -4,7 +4,7 @@ set -x
 
 SERVICE="fancontrol"
 
-[ -e "/etc/svc/default/$SERVICE" ] && . "/etc/svc/default/$SERVICE"
+[ -e "/bin/svc.d/default/$SERVICE" ] && . "/bin/svc.d/default/$SERVICE"
 
 BIN="/usr/sbin/$SERVICE"
 
diff --git a/svc.d/avail/hwclock b/svc.d/avail/hwclock
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. /svc/etc/default/hwclock
+. /bin/svc.d/default/hwclock
 
 case $1 in
 	-s)
diff --git a/svc.d/avail/laptop-mode b/svc.d/avail/laptop-mode
@@ -2,7 +2,7 @@
 
 SERVICE="laptop-mode"
 
-[ -e "/etc/svc/default/$SERVICE" ] && . "/etc/svc/default/$SERVICE"
+[ -e "/bin/svc.d/default/$SERVICE" ] && . "/bin/svc.d/default/$SERVICE"
 
 BIN="/usr/sbin/$SERVICE"
 
diff --git a/svc.d/avail/ntpd b/svc.d/avail/ntpd
@@ -2,7 +2,7 @@
 
 SERVICE="ntpd"
 
-[ -e "/etc/svc/default/$SERVICE" ] && . "/etc/svc/default/$SERVICE"
+[ -e "/bin/svc.d/default/$SERVICE" ] && . "/bin/svc.d/default/$SERVICE"
 
 BIN="/bin/$SERVICE"
 
diff --git a/svc.d/avail/rfkill b/svc.d/avail/rfkill
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. /etc/svc/default/rfkill
+. /bin/svc.d/default/rfkill
 
 case $1 in
 	-s)
diff --git a/svc.d/avail/sensors b/svc.d/avail/sensors
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. /etc/svc/default/sensors
+. /bin/svc.d/default/sensors
 
 case $1 in
 	-s)
diff --git a/svc.d/avail/sshd b/svc.d/avail/sshd
@@ -2,7 +2,7 @@
 
 SERVICE="sshd"
 
-[ -e "/etc/svc/default/$SERVICE" ] && . "/etc/svc/default/$SERVICE"
+[ -e "/bin/svc.d/default/$SERVICE" ] && . "/bin/svc.d/default/$SERVICE"
 
 BIN=""
 for p in /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin;
diff --git a/svc.d/avail/thinkfan b/svc.d/avail/thinkfan
@@ -4,7 +4,7 @@ SERVICE="thinkfan"
 BIN="/usr/bin/thinkfan"
 PIDFILE="/var/run/thinkfan.pid"
 
-[ -e "/etc/svc/default/$SERVICE" ] && . "/etc/svc/default/$SERVICE"
+[ -e "/bin/svc.d/default/$SERVICE" ] && . "/bin/svc.d/default/$SERVICE"
 
 if [ -e "$PIDFILE" ];
 then
diff --git a/svc.d/avail/wireless-regdom b/svc.d/avail/wireless-regdom
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. /etc/svc/default/wireless-regdom
+. /bin/svc.d/default/wireless-regdom
 
 case $1 in
 	-s)
diff --git a/svc.d/run/acpid b/svc.d/run/acpid
@@ -1 +0,0 @@
-../avail/acpid-
\ No newline at end of file
diff --git a/svc.d/run/alsa b/svc.d/run/alsa
@@ -1 +0,0 @@
-../avail/alsa-
\ No newline at end of file
diff --git a/svc.d/run/atd b/svc.d/run/atd
@@ -1 +0,0 @@
-../avail/atd-
\ No newline at end of file
diff --git a/svc.d/run/crond b/svc.d/run/crond
@@ -1 +0,0 @@
-../avail/crond-
\ No newline at end of file
diff --git a/svc.d/run/dovecot b/svc.d/run/dovecot
@@ -1 +0,0 @@
-../avail/dovecot-
\ No newline at end of file
diff --git a/svc.d/run/gpsd b/svc.d/run/gpsd
@@ -1 +0,0 @@
-../avail/gpsd-
\ No newline at end of file
diff --git a/svc.d/run/hwclock b/svc.d/run/hwclock
@@ -1 +0,0 @@
-../avail/hwclock-
\ No newline at end of file
diff --git a/svc.d/run/laptop-mode b/svc.d/run/laptop-mode
@@ -1 +0,0 @@
-../avail/laptop-mode-
\ No newline at end of file
diff --git a/svc.d/run/nscd b/svc.d/run/nscd
@@ -1 +0,0 @@
-../avail/nscd-
\ No newline at end of file
diff --git a/svc.d/run/rfkill b/svc.d/run/rfkill
@@ -1 +0,0 @@
-../avail/rfkill-
\ No newline at end of file
diff --git a/svc.d/run/rfkilld b/svc.d/run/rfkilld
@@ -1 +0,0 @@
-../avail/rfkilld-
\ No newline at end of file
diff --git a/svc.d/run/sensors b/svc.d/run/sensors
@@ -1 +0,0 @@
-../avail/sensors-
\ No newline at end of file
diff --git a/svc.d/run/sshd b/svc.d/run/sshd
@@ -1 +0,0 @@
-../avail/sshd-
\ No newline at end of file
diff --git a/svc.d/run/syslog-ng b/svc.d/run/syslog-ng
@@ -1 +0,0 @@
-../avail/syslog-ng-
\ No newline at end of file
diff --git a/svc.d/run/wireless-regdom b/svc.d/run/wireless-regdom
@@ -1 +0,0 @@
-../avail/wireless-regdom-
\ No newline at end of file