diff options
author | Zack Welch <zwelch@gentoo.org> | 2002-10-19 22:05:26 +0000 |
---|---|---|
committer | Zack Welch <zwelch@gentoo.org> | 2002-10-19 22:05:26 +0000 |
commit | a84eb68957a66e67c468941eacbe5d9f2f066930 (patch) | |
tree | c1eca1f7d587fa63ebdbaace713863af26bc25c9 /sys-apps/hotplug | |
parent | forgot description (diff) | |
download | gentoo-2-a84eb68957a66e67c468941eacbe5d9f2f066930.tar.gz gentoo-2-a84eb68957a66e67c468941eacbe5d9f2f066930.tar.bz2 gentoo-2-a84eb68957a66e67c468941eacbe5d9f2f066930.zip |
missed two patches for new version
Diffstat (limited to 'sys-apps/hotplug')
-rw-r--r-- | sys-apps/hotplug/files/hotplug-20020826-pci.rc-gentoo.diff | 39 | ||||
-rw-r--r-- | sys-apps/hotplug/files/hotplug-20020826-usb.rc-gentoo.diff | 29 |
2 files changed, 68 insertions, 0 deletions
diff --git a/sys-apps/hotplug/files/hotplug-20020826-pci.rc-gentoo.diff b/sys-apps/hotplug/files/hotplug-20020826-pci.rc-gentoo.diff new file mode 100644 index 000000000000..f65ef2449dff --- /dev/null +++ b/sys-apps/hotplug/files/hotplug-20020826-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-20020826-usb.rc-gentoo.diff b/sys-apps/hotplug/files/hotplug-20020826-usb.rc-gentoo.diff new file mode 100644 index 000000000000..149c1dbcc97d --- /dev/null +++ b/sys-apps/hotplug/files/hotplug-20020826-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 + + |