diff -u hal-0.2.98/debian/changelog hal-0.2.98/debian/changelog --- hal-0.2.98/debian/changelog +++ hal-0.2.98/debian/changelog @@ -1,3 +1,9 @@ +hal (0.2.98-1ubuntu7) warty; urgency=low + + * reintroduced init script beautification (Warty bug #2135) + + -- Martin Pitt Thu, 7 Oct 2004 14:14:24 +0200 + hal (0.2.98-1ubuntu6) warty; urgency=low * added patch pci_pre_process_check_null to fix yet another segfault due to diff -u hal-0.2.98/debian/hal.init.dbus hal-0.2.98/debian/hal.init.dbus --- hal-0.2.98/debian/hal.init.dbus +++ hal-0.2.98/debian/hal.init.dbus @@ -25,18 +25,26 @@ set -e +. /lib/lsb/init-functions + case "$1" in start) - echo -n "Starting $DESC: " - start-stop-daemon --start --pidfile $PIDFILE \ - --exec $DAEMON -- $DAEMON_OPTS - echo "$NAME." + log_begin_msg "Starting $DESC..." + if start-stop-daemon --start --pidfile $PIDFILE \ + --exec $DAEMON -- $DAEMON_OPTS ; then + log_end_msg 0 + else + log_end_msg 1 + fi ;; stop) - echo -n "Stopping $DESC: " - start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE \ - --exec $DAEMON - echo "$NAME." + log_begin_msg "Stopping $DESC..." + if start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE \ + --exec $DAEMON ; then + log_end_msg 0 + else + log_end_msg 1 + fi ;; #reload) # @@ -56,18 +64,21 @@ # option to the "reload" entry above. If not, "force-reload" is # just the same as "restart". # - echo -n "Restarting $DESC: " + log_begin_msg "Restarting $DESC..." start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE \ --exec $DAEMON sleep 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --exec $DAEMON -- $DAEMON_OPTS - echo "$NAME." + if start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --exec $DAEMON -- $DAEMON_OPTS ; then + log_end_msg 0 + else + log_end_msg 1 + fi ;; *) N=/etc/init.d/$NAME # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $N {start|stop|restart|force-reload}" >&2 + log_success_msg "Usage: $N {start|stop|restart|force-reload}" exit 1 ;; esac