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

init.d/nginx

@@ -20,10 +20,6 @@ reload() {
 	fi
 }
 
-restart() {
-	stop && start
-}
-
 upgrade() {
 	watchman.msg "This script has no zero-downtime upgrade support for nginx."
 }

init.d/vdevd

@@ -7,5 +7,9 @@ service_tmpfiles=( '/run/vdev:dir' '/run/udev:symlink:/dev/metadata/udev' )
 
 pre_start() {
 	# Ensure that hotplug is empty
+	if [[ -f /proc/sys/kernel/hotplug ]]; then
 		true > /proc/sys/kernel/hotplug
+	fi
+
+	"$service_command" -1 -f /dev &>"$service_logfile"
 }

init.d/znet

@@ -1,7 +1,7 @@
 #!/usr/bin/env watchman
 
 service_type='oneshot'
-service_command='/usr/local/sbin/znet'
+service_command='/usr/bin/znet'
 service_args=( -d )
 
 stop() {