| Patrick Williams | 8b8bc41 | 2016-08-17 15:02:23 -0500 | [diff] [blame] | 1 | Remove dependencies on LSB functions |
| 2 | |
| 3 | Upstream-Status: Inappropriate [configuration] |
| 4 | |
| 5 | Signed-off-by: Alex Lennon <ajlennon@dynamicdevices.co.uk> |
| 6 | |
| 7 | diff -ur git.org/pi-blaster.boot.sh git/pi-blaster.boot.sh |
| 8 | --- git.org/pi-blaster.boot.sh 2014-05-20 14:49:44.378582168 +0100 |
| 9 | +++ git/pi-blaster.boot.sh 2014-05-20 14:51:08.330582386 +0100 |
| 10 | @@ -28,12 +28,12 @@ |
| 11 | [ -r /etc/default/$NAME ] && . /etc/default/$NAME |
| 12 | |
| 13 | # Load the VERBOSE setting and other rcS variables |
| 14 | -. /lib/init/vars.sh |
| 15 | +#. /lib/init/vars.sh |
| 16 | |
| 17 | # Define LSB log_* functions. |
| 18 | # Depend on lsb-base (>= 3.2-14) to ensure that this file is present |
| 19 | # and status_of_proc is working. |
| 20 | -. /lib/lsb/init-functions |
| 21 | +#. /lib/lsb/init-functions |
| 22 | |
| 23 | # |
| 24 | # Function that starts the daemon/service |
| 25 | @@ -77,48 +77,23 @@ |
| 26 | |
| 27 | case "$1" in |
| 28 | start) |
| 29 | - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" |
| 30 | + [ "$VERBOSE" != no ] && echo "Starting $DESC" "$NAME" |
| 31 | do_start |
| 32 | - case "$?" in |
| 33 | - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; |
| 34 | - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; |
| 35 | - esac |
| 36 | ;; |
| 37 | stop) |
| 38 | - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" |
| 39 | + [ "$VERBOSE" != no ] && echo "Stopping $DESC" "$NAME" |
| 40 | do_stop |
| 41 | - case "$?" in |
| 42 | - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; |
| 43 | - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; |
| 44 | - esac |
| 45 | - ;; |
| 46 | - status) |
| 47 | - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? |
| 48 | ;; |
| 49 | restart|force-reload) |
| 50 | # |
| 51 | # If the "reload" option is implemented then remove the |
| 52 | # 'force-reload' alias |
| 53 | # |
| 54 | - log_daemon_msg "Restarting $DESC" "$NAME" |
| 55 | do_stop |
| 56 | - case "$?" in |
| 57 | - 0|1) |
| 58 | - do_start |
| 59 | - case "$?" in |
| 60 | - 0) log_end_msg 0 ;; |
| 61 | - 1) log_end_msg 1 ;; # Old process is still running |
| 62 | - *) log_end_msg 1 ;; # Failed to start |
| 63 | - esac |
| 64 | - ;; |
| 65 | - *) |
| 66 | - # Failed to stop |
| 67 | - log_end_msg 1 |
| 68 | - ;; |
| 69 | - esac |
| 70 | + do_start |
| 71 | ;; |
| 72 | *) |
| 73 | - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 |
| 74 | + echo "Usage: $SCRIPTNAME {start|stop|restart}" >&2 |
| 75 | exit 3 |
| 76 | ;; |
| 77 | esac |