improve-init-scripts.patch 3.1 KB

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