[kernel] r7609 - people/jurij/ipw3945-daemon/debian

[Jurij Smakov]

Author: jurij-guest
Date: Sat Oct 14 04:11:49 2006
New Revision: 7609

Modified:
   people/jurij/ipw3945-daemon/debian/control
   people/jurij/ipw3945-daemon/debian/init

Log:
Use lsb functions, add dependency on lsb-base.


Modified: people/jurij/ipw3945-daemon/debian/control
==============================================================================
--- people/jurij/ipw3945-daemon/debian/control	(original)
+++ people/jurij/ipw3945-daemon/debian/control	Sat Oct 14 04:11:49 2006
@@ -7,7 +7,7 @@
 
 Package: ipw3945-daemon
 Architecture: i386 amd64
-Depends: adduser, ${shlibs:Depends}
+Depends: adduser, lsb-base (>= 3.1), ${shlibs:Depends}
 Description: Binary userspace regulatory daemon for Intel PRO/Wireless 3945ABG cards
  The regulatory daemon is responsible for controlling and configuring 
  aspects of the hardware required to operate the device within 

Modified: people/jurij/ipw3945-daemon/debian/init
==============================================================================
--- people/jurij/ipw3945-daemon/debian/init	(original)
+++ people/jurij/ipw3945-daemon/debian/init	Sat Oct 14 04:11:49 2006
@@ -11,6 +11,8 @@
 #                    for operation of Intel/PRO Wireless 3945ABG cards
 ### END INIT INFO
 
+. /lib/lsb/init-functions
+
 DAEMON_RUN='yes'
 DAEMON_OWNER='Debian-ipw3945d:Debian-ipw3945d'
 DAEMON_BINARY='/sbin/ipw3945d'
@@ -24,26 +26,27 @@
 start_daemon() {
   cmd="$(echo /sys/bus/pci/drivers/ipw3945/*/cmd)"
   if [ -z "${cmd}" ]; then
-    echo "Not starting regulatory daemon, ipw3945 driver not loaded."
+    log_warning_msg "Not starting ipw3945 regulatory daemon, driver not loaded."
   else
-    echo -n "Starting ipw3945 regulatory daemon: ipw3945d"
+    log_daemon_msg "Starting ipw3945 regulatory daemon" "ipw3945d"
     # Fix permissions
     chown "${DAEMON_OWNER}" ${cmd}
     chmod "${SYS_CMD_PERM}" ${cmd}
     start-stop-daemon --start --quiet --chuid "${DAEMON_OWNER}"           \
                       --exec "${DAEMON_BINARY}" --pidfile "${DAEMON_PID}" \
-		      -- --pid-file=${DAEMON_PID} --quiet
-    echo "."
+		      --oknodo -- --pid-file=${DAEMON_PID} --quiet > /dev/null 2>&1
+    code=$?
+    log_end_msg ${code}
   fi
 }
 
 stop_daemon () {
-  echo -n "Stopping ipw3945 regulatory daemon: ipw3945d"
+  log_daemon_msg "Stopping ipw3945 regulatory daemon" "ipw3945d"
   start-stop-daemon --stop --quiet --pidfile "${DAEMON_PID}" \
                     --signal TERM > /dev/null 2>&1
 # Daemon does not remove its own PID file, so we do it
   test -f "${DAEMON_PID}" && rm -f "${DAEMON_PID}"
-  echo "."
+  log_end_msg 0
 }
 
 test -x "${DAEMON_BINARY}" || exit 0