diff options
author | Wout Mertens <wmertens@gentoo.org> | 2002-05-11 01:20:24 +0000 |
---|---|---|
committer | Wout Mertens <wmertens@gentoo.org> | 2002-05-11 01:20:24 +0000 |
commit | e67573ff46e3ec0ad87518f54edb289fa2b4605c (patch) | |
tree | ee699e46fc9e138117252cb91c359462637b1e36 /sys-apps/hotplug/files | |
parent | Masked openoffice 1.0, it needs to be tested. (diff) | |
download | gentoo-2-e67573ff46e3ec0ad87518f54edb289fa2b4605c.tar.gz gentoo-2-e67573ff46e3ec0ad87518f54edb289fa2b4605c.tar.bz2 gentoo-2-e67573ff46e3ec0ad87518f54edb289fa2b4605c.zip |
New ebuild and fix for hotplug startup
Diffstat (limited to 'sys-apps/hotplug/files')
-rw-r--r-- | sys-apps/hotplug/files/digest-hotplug-20020401 | 1 | ||||
-rw-r--r-- | sys-apps/hotplug/files/hotplug-20020401-pci.rc-gentoo.diff | 39 | ||||
-rw-r--r-- | sys-apps/hotplug/files/hotplug-20020401-usb.rc-gentoo.diff | 29 | ||||
-rw-r--r-- | sys-apps/hotplug/files/hotplug.rc | 12 | ||||
-rw-r--r-- | sys-apps/hotplug/files/usb.conf | 7 |
5 files changed, 82 insertions, 6 deletions
diff --git a/sys-apps/hotplug/files/digest-hotplug-20020401 b/sys-apps/hotplug/files/digest-hotplug-20020401 new file mode 100644 index 000000000000..d02541276722 --- /dev/null +++ b/sys-apps/hotplug/files/digest-hotplug-20020401 @@ -0,0 +1 @@ +MD5 50792a87d2eea046616d815e03d1af6b hotplug-2002_04_01.tar.gz 36984 diff --git a/sys-apps/hotplug/files/hotplug-20020401-pci.rc-gentoo.diff b/sys-apps/hotplug/files/hotplug-20020401-pci.rc-gentoo.diff new file mode 100644 index 000000000000..f65ef2449dff --- /dev/null +++ b/sys-apps/hotplug/files/hotplug-20020401-pci.rc-gentoo.diff @@ -0,0 +1,39 @@ +--- pci.rc.orig Fri May 10 18:31:51 2002 ++++ pci.rc Fri May 10 19:02:00 2002 +@@ -9,27 +9,14 @@ + + cd /etc/hotplug + +-# source function library +-if [ -f /etc/init.d/functions ]; then +- . /etc/init.d/functions +-elif [ -f /etc/rc.d/init.d/functions ]; then +- . /etc/rc.d/init.d/functions +-fi +- + . hotplug.functions + +- +-# # override any of the defaults? +-# if [ -f /etc/sysconfig/pci ]; then +-# . /etc/sysconfig/pci +-# fi +- + pci_boot_events () + { + LISTER=`type -p pcimodules` + if [ "$LISTER" = "" -o ! -f /proc/bus/pci/devices -o ! -x pci.agent ]; then + echo $"** can't synthesize pci hotplug events" +- return ++ return 1 + fi + + # make sure the pci agent will run +@@ -61,7 +48,6 @@ + pci_boot_events + ;; + stop) +- echo $"pci stop -- ignored" + ;; + status) + echo $"PCI Status for kernel: " `uname -srm` diff --git a/sys-apps/hotplug/files/hotplug-20020401-usb.rc-gentoo.diff b/sys-apps/hotplug/files/hotplug-20020401-usb.rc-gentoo.diff new file mode 100644 index 000000000000..149c1dbcc97d --- /dev/null +++ b/sys-apps/hotplug/files/hotplug-20020401-usb.rc-gentoo.diff @@ -0,0 +1,29 @@ +--- usb.rc.orig Fri May 10 18:32:00 2002 ++++ usb.rc Fri May 10 19:01:14 2002 +@@ -17,23 +17,16 @@ + # EHCI/OHCI/UHCI/..., hid, input, keybdev; and likely mousedev) so the + # system console can't be removed by accident. + ++# Adapted for gentoo by wmertens + + PATH=/sbin:/bin:/usr/sbin:/usr/bin + + STATIC_MODULE_LIST= + X11_USBMICE_HACK=false + +-# source function library +-if [ -f /etc/init.d/functions ]; then +- . /etc/init.d/functions +-elif [ -f /etc/rc.d/init.d/functions ]; then +- . /etc/rc.d/init.d/functions +-fi +- +- + # override any of the defaults above? +-if [ -f /etc/sysconfig/usb ]; then +- . /etc/sysconfig/usb ++if [ -f /etc/conf.d/usb ]; then ++ . /etc/conf.d/usb + fi + + diff --git a/sys-apps/hotplug/files/hotplug.rc b/sys-apps/hotplug/files/hotplug.rc index 54ef65fec47c..21295a2789a9 100644 --- a/sys-apps/hotplug/files/hotplug.rc +++ b/sys-apps/hotplug/files/hotplug.rc @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/files/hotplug.rc,v 1.2 2002/02/25 23:02:14 woodchip Exp $ +# /space/gentoo/cvsroot/gentoo-x86/sys-apps/hotplug/files/hotplug.rc,v 1.2 2002/02/25 23:02:14 woodchip Exp depend() { need modules @@ -9,7 +9,7 @@ depend() { checkconfig() { if [ ! -d /etc/hotplug ] ; then - eerror "USB Hotplug requires scripts & configs in /etc/hotplug !" + eerror "Hotplug requires scripts & configs in /etc/hotplug !" return 1 fi } @@ -17,12 +17,12 @@ checkconfig() { start() { local error checkconfig || return 1 - ebegin "Starting USB Hotplug" + ebegin "Starting USB and PCI hotplugging" for RC in /etc/hotplug/*.rc do $RC start error=$? - if [ error ] ; then + if [ $error -ne 0 ] ; then eend ${error} "hotplug script $RC failed at start" return 1 fi @@ -32,12 +32,12 @@ start() { stop() { local error - ebegin "Stopping USB Hotplug " + ebegin "Stopping USB and PCI hotplugging" for RC in /etc/hotplug/*.rc do $RC stop error=$? - if [ error ] ; then + if [ $error -ne 0 ] ; then eend ${error} "hot plug script $RC failed at stop" return 1 fi diff --git a/sys-apps/hotplug/files/usb.conf b/sys-apps/hotplug/files/usb.conf new file mode 100644 index 000000000000..a7b4e0be0e48 --- /dev/null +++ b/sys-apps/hotplug/files/usb.conf @@ -0,0 +1,7 @@ +# If you have a USB mouse, you probably want to enable the following, +# and change your XFree86 configuration so that it uses /dev/input/mice +# as the mouse input device +#X11_USBMICE_HACK=true + +# Put any modules here that you want to be loaded by the USB hotplug system +#STATIC_MODULE_LIST= |