From 9029e89e49d31a4f4148fa215d52bcdf7d73f7c8 Mon Sep 17 00:00:00 2001 From: fbt Date: Sat, 31 Oct 2015 18:07:33 +0300 Subject: [PATCH 1/4] run vdev once first --- init.d/vdevd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/init.d/vdevd b/init.d/vdevd index ebde571..7b00a8e 100755 --- a/init.d/vdevd +++ b/init.d/vdevd @@ -8,4 +8,6 @@ service_tmpfiles=( '/run/vdev:dir' '/run/udev:symlink:/dev/metadata/udev' ) pre_start() { # Ensure that hotplug is empty true > /proc/sys/kernel/hotplug + + "$service_command" -1 -f /dev &>"$service_logfile" } From 349c86ba91c6944d986b14b81856ed7408e5db32 Mon Sep 17 00:00:00 2001 From: fbt Date: Sun, 1 Nov 2015 13:18:52 +0300 Subject: [PATCH 2/4] do not bother if hotplug does not exist --- init.d/vdevd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/init.d/vdevd b/init.d/vdevd index 7b00a8e..76459e5 100755 --- a/init.d/vdevd +++ b/init.d/vdevd @@ -7,7 +7,9 @@ service_tmpfiles=( '/run/vdev:dir' '/run/udev:symlink:/dev/metadata/udev' ) pre_start() { # Ensure that hotplug is empty - true > /proc/sys/kernel/hotplug + if [[ -f /proc/sys/kernel/hotplug ]]; then + true > /proc/sys/kernel/hotplug + fi "$service_command" -1 -f /dev &>"$service_logfile" } From f8e984d0f9fba5a2bc3065dffc032685e5f01c93 Mon Sep 17 00:00:00 2001 From: fbt Date: Sun, 1 Nov 2015 15:30:10 +0300 Subject: [PATCH 3/4] why was that there --- init.d/nginx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/init.d/nginx b/init.d/nginx index 21221a0..20d3773 100755 --- a/init.d/nginx +++ b/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." } From 561fefc912a5ace7d2ec60d2666fa1de9274d8b0 Mon Sep 17 00:00:00 2001 From: fbt Date: Thu, 5 Nov 2015 11:01:11 +0300 Subject: [PATCH 4/4] no usr/local in the scripts! --- init.d/znet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.d/znet b/init.d/znet index 489baf6..4b5f1bf 100755 --- a/init.d/znet +++ b/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() {