Author: jurij-guest
Date: Mon Oct 16 04:52:05 2006
New Revision: 7612
Modified:
people/jurij/ipw3945-daemon/debian/README.Debian
people/jurij/ipw3945-daemon/debian/control
people/jurij/ipw3945-daemon/debian/default
people/jurij/ipw3945-daemon/debian/rules
Log:
Another large update. Implemented daemon start on
module loading/unloading events via modprobe (does not
quite work yet).
Modified: people/jurij/ipw3945-daemon/debian/README.Debian
==============================================================================
--- people/jurij/ipw3945-daemon/debian/README.Debian (original)
+++ people/jurij/ipw3945-daemon/debian/README.Debian Mon Oct 16 04:52:05 2006
@@ -1,22 +1,30 @@
-In Debian the ipw3945 daemon is setup to run as non-root user, which
-will be created during installation of the package. To operate
-successfully, daemon needs access to some files in /sys directory tree,
-namely /sys/bus/pci/drivers/ipw3945/*/cmd. The init script
-/etc/init.d/ipw3945-daemon will correctly set the permissions and
-ownership for these entries each time before starting the daemon. The
-following variables in /etc/default/ipw3945-daemon file may be used to
-control the behaviour of the init script (default values are shown):
+As the ipw3945d daemon requires the ipw3945 driver module to be loaded, it is
+started not through the usual /etc/init.d mechanism, but whenever the ipw394
+module is loaded by 'modprobe' (and, correspondingly, stopped just before the
+module is unloaded). This is implemented by installing the modprobe
+configuration file /etc/modprobe.d/ipw3945-daemon, which calls the scripts in
+/usr/lib/ipw3945-daemon on suitable occasions. Normally, the ipw3945 module
+will be automatically loaded by udev during system startup if available,
+causing the daemon to be started.
+
+In Debian the ipw3945d is set up to run as non-root user, which will be
created
+during installation of the package. To operate successfully, daemon needs
+access to some files in /sys directory tree. The /usr/lib/ipw3945-daemon/start
+script will correctly set the permissions and ownership for these entries each
+time before starting the daemon. Note, that changes to this script will *not*
+be preserved on upgrades. In order to control its behavior, adjust the values
+of the following variables in /etc/default/ipw3945-daemon (default values are
+shown):
-DAEMON_RUN='yes'
- Run the daemon? Will disable it if set to anything other
- than 'yes'.
DAEMON_BINARY='/sbin/ipw3945d'
The location of the daemon binary
-DAEMON_OWNER='Debian-ipw3945d:Debian-ipw3945d'
- User and group id the daemon will run under. If you change that,
- you have to make sure that the specified user/group has sufficient
- permission to write the process id (PID) file specified by
- DAEMON_PID variable
+DAEMON_USER='Debian-ipw3945d'
+DAEMON_GROUP='Debian-ipw3945d'
+ User and group id the daemon will run under. Also, those values will
+ be used to set the ownership of the /sys entries, which daemon needs
+ access to. If you change those, you have to make sure that the
+ specified user/group exists and has sufficient permissions to write
the
+ process id (PID) file specified by DAEMON_PID variable
SYS_CMD_PERM='744'
Permissions for the entries in /sys tree.
DAEMON_PID='/var/run/ipw3945d.pid'
Modified: people/jurij/ipw3945-daemon/debian/control
==============================================================================
--- people/jurij/ipw3945-daemon/debian/control (original)
+++ people/jurij/ipw3945-daemon/debian/control Mon Oct 16 04:52:05 2006
@@ -8,7 +8,7 @@
Package: ipw3945-daemon
Architecture: i386 amd64
-Depends: adduser, lsb-base (>= 3.1), ${shlibs:Depends}
+Depends: adduser, ${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/default
==============================================================================
--- people/jurij/ipw3945-daemon/debian/default (original)
+++ people/jurij/ipw3945-daemon/debian/default Mon Oct 16 04:52:05 2006
@@ -1,5 +1,5 @@
-DAEMON_RUN='yes'
DAEMON_BINARY='/sbin/ipw3945d'
-DAEMON_OWNER='Debian-ipw3945d:Debian-ipw3945d'
+DAEMON_USER='Debian-ipw3945d'
+DAEMON_GROUP='Debian-ipw3945d'
SYS_CMD_PERM='744'
DAEMON_PID='/var/run/ipw3945-daemon/ipw3945d.pid'
Modified: people/jurij/ipw3945-daemon/debian/rules
==============================================================================
--- people/jurij/ipw3945-daemon/debian/rules (original)
+++ people/jurij/ipw3945-daemon/debian/rules Mon Oct 16 04:52:05 2006
@@ -29,14 +29,8 @@
dh_installdocs README.ipw3945d
dh_installchangelogs
dh_installdirs
-# We need to start before S40networking on runlevel S and
-# die after S35networking on runlevels 0 and 6. In a pretty
-# retarded fashion, the scripts are called with a 'stop'
-# argument on runlevels 0 and 6 even if they starts with 'S'.
-# Therefore, for these runlevels we need to install *start*
-# symlinks, with sequence number greater than that of
-# networking.
- dh_installinit -- start 39 S . start 36 0 6 .
+ dh_installinit
+ dh_installmodules
dh_installman debian/ipw3945d.8
# Install the right version, depending on the arch
dh_install $(ARCHDIR)/ipw3945d /sbin
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
