1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
Subject: Improve init scripts
Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
Forwarded: not-yet
Date: 2018-09-23
--- a/contrib/persistence/vblade.init.in
+++ b/contrib/persistence/vblade.init.in
@@ -8,7 +8,7 @@
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: vblade exports
-# Description: Manage all vlbade exports defined in
+# Description: Manage all vblade exports defined in
# /etc/vblade.conf.d/
### END INIT INFO
@@ -98,6 +98,10 @@
--exec $ionice "$VBLADE" -- \
$shelf $slot $netif $filename $options \
|| return 2
+ sleep 1
+ start-stop-daemon --start --quiet \
+ --pidfile "$PIDFILE" --exec "$VBLADE" --test > /dev/null \
+ && return 2
[% ELSIF control == 'daemon' -%]
"$DAEMON" \
--running \
@@ -112,6 +116,12 @@
--stdout daemon.notice \
--stderr daemon.err -- \
$VBLADE $options $shelf $slot $netif $filename || return 2
+ sleep 1
+ "$DAEMON" \
+ --running \
+ --name "$INSTANCE" \
+ --pidfiles "$PIDDIR" \
+ || return 2
[% END -%]
}
@@ -168,7 +178,10 @@
do_start "$INSTANCE" "$CONFIG"
case "$?" in
0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ 2)
+ [ "$VERBOSE" != no ] && log_end_msg 1
+ EXIT=1
+ ;;
esac
;;
stop)
@@ -176,7 +189,10 @@
do_stop "$INSTANCE"
case "$?" in
0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ 2)
+ [ "$VERBOSE" != no ] && log_end_msg 1
+ EXIT=1
+ ;;
esac
;;
status)
--- a/contrib/persistence/vblade.init.lsb-daemon
+++ b/contrib/persistence/vblade.init.lsb-daemon
@@ -77,6 +77,12 @@
--stdout daemon.notice \
--stderr daemon.err -- \
$VBLADE $options $shelf $slot $netif $filename || return 2
+ sleep 1
+ "$DAEMON" \
+ --running \
+ --name "$INSTANCE" \
+ --pidfiles "$PIDDIR" \
+ || return 2
}
# Stop a vblade instance
@@ -121,7 +127,10 @@
do_start "$INSTANCE" "$CONFIG"
case "$?" in
0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ 2)
+ [ "$VERBOSE" != no ] && log_end_msg 1
+ EXIT=1
+ ;;
esac
;;
stop)
@@ -129,7 +138,10 @@
do_stop "$INSTANCE"
case "$?" in
0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ 2)
+ [ "$VERBOSE" != no ] && log_end_msg 1
+ EXIT=1
+ ;;
esac
;;
status)
|
