summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2006-12-17 19:52:19 +0000
committerChristian Heim <phreak@gentoo.org>2006-12-17 19:52:19 +0000
commiteb839b354cdf516057e8d7adc274e0a141d53354 (patch)
tree08897e965bda02c930845220d1e3a5b1de5ac63f /net-wireless/ipw3945d/files
parentRemove pdf USE check to cairo (diff)
downloadgentoo-2-eb839b354cdf516057e8d7adc274e0a141d53354.tar.gz
gentoo-2-eb839b354cdf516057e8d7adc274e0a141d53354.tar.bz2
gentoo-2-eb839b354cdf516057e8d7adc274e0a141d53354.zip
Revision bump, hopefully fixing some of the bugs introduced by ripping of Hendrik's modprobe.conf files.
(Portage version: 2.1.2_rc3-r6)
Diffstat (limited to 'net-wireless/ipw3945d/files')
-rw-r--r--net-wireless/ipw3945d/files/digest-ipw3945d-1.7.22-r43
-rw-r--r--net-wireless/ipw3945d/files/ipw3945d-1.7.22-modprobe.conf2
-rw-r--r--net-wireless/ipw3945d/files/ipw3945d-conf.d2
-rw-r--r--net-wireless/ipw3945d/files/ipw3945d-init.d16
4 files changed, 20 insertions, 3 deletions
diff --git a/net-wireless/ipw3945d/files/digest-ipw3945d-1.7.22-r4 b/net-wireless/ipw3945d/files/digest-ipw3945d-1.7.22-r4
new file mode 100644
index 000000000000..92883c1f4f53
--- /dev/null
+++ b/net-wireless/ipw3945d/files/digest-ipw3945d-1.7.22-r4
@@ -0,0 +1,3 @@
+MD5 a8404cb63de7493d1405d5132ea02823 ipw3945d-1.7.22.tgz 59936
+RMD160 26c1e602f7f33f8eb8856256a35c59db308c8f17 ipw3945d-1.7.22.tgz 59936
+SHA256 d2cb513b8cedc1515a9c5a4a367aa7869bf2cc644019ebe0737cb13384ef9397 ipw3945d-1.7.22.tgz 59936
diff --git a/net-wireless/ipw3945d/files/ipw3945d-1.7.22-modprobe.conf b/net-wireless/ipw3945d/files/ipw3945d-1.7.22-modprobe.conf
new file mode 100644
index 000000000000..74e3262dc7ae
--- /dev/null
+++ b/net-wireless/ipw3945d/files/ipw3945d-1.7.22-modprobe.conf
@@ -0,0 +1,2 @@
+install ipw3945 /sbin/modprobe --ignore-install ipw3945; sleep 0.5; /etc/init.d/ipw3945d start
+remove ipw3945 /etc/init.d/ipw3945d stop; /sbin/modprobe -r --ignore-remove ipw3945
diff --git a/net-wireless/ipw3945d/files/ipw3945d-conf.d b/net-wireless/ipw3945d/files/ipw3945d-conf.d
index 03cb1fcc79ce..571d42d65928 100644
--- a/net-wireless/ipw3945d/files/ipw3945d-conf.d
+++ b/net-wireless/ipw3945d/files/ipw3945d-conf.d
@@ -2,4 +2,4 @@
# Arguments to be passed to ipw3945d. See 'ipw3945d --help' for more
# information.
-ARGS="--timeout=-1 --quiet"
+ARGS="--timeout=-1"
diff --git a/net-wireless/ipw3945d/files/ipw3945d-init.d b/net-wireless/ipw3945d/files/ipw3945d-init.d
index 75bd469a9979..e691710ad740 100644
--- a/net-wireless/ipw3945d/files/ipw3945d-init.d
+++ b/net-wireless/ipw3945d/files/ipw3945d-init.d
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/files/ipw3945d-init.d,v 1.2 2006/09/09 07:53:40 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/files/ipw3945d-init.d,v 1.3 2006/12/17 19:52:19 phreak Exp $
PIDFILE=/var/run/ipw3945d/ipw3945d.pid
@@ -9,8 +9,20 @@ depend() {
before net
}
+check() {
+ # Let's check if the pidfile is still present.
+ if [ -f "${PIDFILE}" ] ; then
+ eerror "The pidfile ($PIDFILE) is still present."
+ eerror "Please check that the daemon isn't running!"
+ exit 1
+ fi
+}
+
start() {
+ check
ebegin "Starting ipw3945d"
+ chown ipw3945d /sys/bus/pci/drivers/ipw3945/00*/cmd
+ chmod a-w,u+rw /sys/bus/pci/drivers/ipw3945/00*/cmd
start-stop-daemon --start --exec /sbin/ipw3945d --pidfile ${PIDFILE} -- \
--pid-file=${PIDFILE} ${ARGS}
eend ${?}
@@ -18,6 +30,6 @@ start() {
stop() {
ebegin "Stopping ipw3945d"
- start-stop-daemon --stop --exec /sbin/ipw3945 --pidfile ${PIDFILE}
+ start-stop-daemon --stop --exec /sbin/ipw3945d --pidfile ${PIDFILE}
eend ${?}
}