diff options
| author |   Donny Davies <woodchip@gentoo.org> | 2002-02-25 23:02:14 +0000 |
|---|---|---|
| committer | Donny Davies <woodchip@gentoo.org> | 2002-02-25 23:02:14 +0000 |
| commit | 6fc83e056ad52fde6a5203768336bed319a9040a (patch) | |
| tree | 858a7378361d03531d39dbbcbd580aadfcae5317 /sys-apps/hotplug/files | |
| parent | unmasking 2.4.18 kernel (diff) | |
| download | gentoo-2-6fc83e056ad52fde6a5203768336bed319a9040a.tar.gz gentoo-2-6fc83e056ad52fde6a5203768336bed319a9040a.tar.bz2 gentoo-2-6fc83e056ad52fde6a5203768336bed319a9040a.zip | |
some small fixes.
there is no need for touch /var/lock/subsys/hotplug
with our init system.
Diffstat (limited to 'sys-apps/hotplug/files')
| -rw-r--r-- | sys-apps/hotplug/files/hotplug.rc | 25 | ||||
| -rw-r--r-- | sys-apps/hotplug/files/pci.rc | 7 | ||||
| -rw-r--r-- | sys-apps/hotplug/files/usb.rc | 4 |
3 files changed, 14 insertions, 22 deletions
diff --git a/sys-apps/hotplug/files/hotplug.rc b/sys-apps/hotplug/files/hotplug.rc index 7e7c0509ae93..54ef65fec47c 100644 --- a/sys-apps/hotplug/files/hotplug.rc +++ b/sys-apps/hotplug/files/hotplug.rc @@ -1,12 +1,14 @@ #!/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 $ depend() { need modules } checkconfig() { - if [ ! -d /etc/hotplug ] - then + if [ ! -d /etc/hotplug ] ; then eerror "USB Hotplug requires scripts & configs in /etc/hotplug !" return 1 fi @@ -15,37 +17,30 @@ checkconfig() { start() { local error checkconfig || return 1 - ebegin "Starting USB Hotplug " + ebegin "Starting USB Hotplug" for RC in /etc/hotplug/*.rc do $RC start error=$? - if [ error ] - then - eend ${error} "hotplug script $RC failed at start " + if [ error ] ; then + eend ${error} "hotplug script $RC failed at start" return 1 fi done - touch /var/lock/subsys/hotplug eend } stop() { local error - checkconfig || return 1 ebegin "Stopping USB Hotplug " for RC in /etc/hotplug/*.rc do $RC stop error=$? - if [ error ] - then - eend ${error} "hot plug script $RC failed at stop " - return 1 + if [ error ] ; then + eend ${error} "hot plug script $RC failed at stop" + return 1 fi done - rm -f /var/lock/subsys/hotplug eend } - - diff --git a/sys-apps/hotplug/files/pci.rc b/sys-apps/hotplug/files/pci.rc index d83ee5a450db..b76cbbb0a7b5 100644 --- a/sys-apps/hotplug/files/pci.rc +++ b/sys-apps/hotplug/files/pci.rc @@ -2,7 +2,7 @@ # # pci.rc mostly to recover lost boot-time pci hotplug events # -# $Id: pci.rc,v 1.1 2002/02/25 02:13:12 blocke Exp $ +# $Id: pci.rc,v 1.2 2002/02/25 23:02:14 woodchip Exp $ # # Modified for Gentoo Linux, sworley 2002-02-20 @@ -12,10 +12,9 @@ cd /etc/hotplug . hotplug.functions -# Gentoo Linux use /etc/conf.d ??? # # override any of the defaults? -if [ -f /etc/conf.d/pci ]; then - . /etc/conf.d/pci +if [ -f /etc/conf.d/pci ] ; then + . /etc/conf.d/pci fi pci_boot_events () diff --git a/sys-apps/hotplug/files/usb.rc b/sys-apps/hotplug/files/usb.rc index f90b578b543d..0a221eefcf29 100644 --- a/sys-apps/hotplug/files/usb.rc +++ b/sys-apps/hotplug/files/usb.rc @@ -2,7 +2,7 @@ # # usb.rc This brings the USB subsystem up and down safely. # -# $Id: usb.rc,v 1.1 2002/02/25 02:13:12 blocke Exp $ +# $Id: usb.rc,v 1.2 2002/02/25 23:02:14 woodchip Exp $ # # Best invoked via /etc/init.d/hotplug or equivalent, with # writable /tmp, /usr mounted, and syslogging active. @@ -26,14 +26,12 @@ STATIC_MODULE_LIST= # USBD_ENABLE=true X11_USBMICE_HACK=false -# Gentoo Linux use /etc/conf.d ??? # override any of the defaults above? if [ -f /etc/conf.d/usb ]; then . /etc/conf.d/usb # e.g. USBD_ENABLE=false but STATIC_MODULE_LIST has your devices fi - MOUSE_MODULES="mousedev input" # In its currently-recommended configuration, XFree86 3.3.6 always opens |