Merge branch 'master' of builder:git/watchman-services

conf.d/devfs-permissions.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env watchman
-# Config for devfs-permissions
-
-cfg_devices=(
-			  '/dev/snd;root:audio;770'
-			  '/dev/dri;root:video;770'
-			  '/dev/fuse;root:root;777'
-			)

init.d/bitflu

@@ -2,7 +2,7 @@
 
 #service_respawn='true'
 service_username='torrent'
-service_command='sudo'
+service_command='/usr/bin/sudo'
 service_args="-u $service_username -- /usr/bin/bitflu --config=/etc/bitflu.cfg"
 
 start() {

init.d/devfs-permissions

@@ -1,17 +0,0 @@
-#!/usr/bin/env watchman
-# This is a script to set up the right permissions in /dev in absence of e?(u|s?m)dev.
-
-service_type='oneshot'
-
-# Config moved to conf.d
-
-spawn() {
-	for d in "${cfg_devices[@]}"; do
-		IFS=';' read device owner perms <<< "$d"
-
-		[[ -e "$device" ]] && {
-			chown -R "$owner" "$device"
-			chmod -R "$perms" "$device"
-		}
-	done
-}

init.d/hostname

@@ -8,5 +8,5 @@ fi
 [[ "$cfg_hostname" ]] || { cfg_hostname='localhost'; }
 
 service_type='oneshot'
-service_command='hostname'
+service_command='/usr/bin/hostname'
 service_args="$cfg_hostname"

init.d/lo.iface

@@ -3,7 +3,8 @@
 cfg_iface="${service_name%%.*}"
 
 service_type='oneshot'
-service_command="ip link set $cfg_iface up"
+service_command='/usr/bin/ip'
+service_args="link set $cfg_iface up"
 
 wait_for_iface() {
 	local iface="$1" timer='0' timeout='6'

init.d/pamusb

@@ -1,5 +1,5 @@
 #!/usr/bin/env watchman
 
-service_command='mkdir'
+service_command='/usr/bin/mkdir'
 service_args='-p /run/lock'
 service_type='oneshot'