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

[Jurij Smakov]

Author: jurij-guest
Date: Wed Oct 11 16:39:54 2006
New Revision: 7597

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

Log:
Correct variable references, set pid file to subdir of /var/run


Modified: people/jurij/ipw3945-daemon/debian/init
==============================================================================
--- people/jurij/ipw3945-daemon/debian/init	(original)
+++ people/jurij/ipw3945-daemon/debian/init	Wed Oct 11 16:39:54 2006
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/sh -x
 
 DAEMON_RUN='yes'
 DAEMON_OWNER='Debian-ipw3945d:Debian-ipw3945d'
 DAEMON_BINARY='/sbin/ipw3945d'
 DAEMON_PERM='744'
-DAEMON_PID='/var/run/ipw3945d.pid'
+DAEMON_PID='/var/run/ipw3945-daemon/ipw3945d.pid'
 
 if [ -r /etc/default/ipw3945-daemon ]; then
   . /etc/default/ipw3945-daemon
@@ -17,11 +17,11 @@
   else
     echo -n "Starting ipw3945 regulatory daemon: ipw3945d"
     # Fix permissions
-    chown ${DAEMON_OWN} ${cmd}
+    chown ${DAEMON_OWNER} ${cmd}
     chmod ${DAEMON_PERM} ${cmd}
-    start-stop-daemon --start --quiet --chuid ${DAEMON_OWN}        \
-                      --exec ${DAEMON_BIN} --pidfile ${DAEMON_PID} \
-		      -- --pid-path ${DAEMON_PID}
+    start-stop-daemon --start --quiet --chuid ${DAEMON_OWNER}        \
+                      --exec ${DAEMON_BINARY} --pidfile ${DAEMON_PID} \
+		      -- --pid-file=${DAEMON_PID}
     echo "."
   fi
 }

Modified: people/jurij/ipw3945-daemon/debian/postinst
==============================================================================
--- people/jurij/ipw3945-daemon/debian/postinst	(original)
+++ people/jurij/ipw3945-daemon/debian/postinst	Wed Oct 11 16:39:54 2006
@@ -3,7 +3,7 @@
 case "$1" in
   configure)
     adduser --quiet --system --no-create-home --force-badname \
-            --groups Debian-ipw3945d
+            --group Debian-ipw3945d
     #DEBHELPER#
     ;;
   abort-upgrade|abort-remove|abort-deconfigure)