cvs commit: LFS/bootscripts/lfs/init.d udev

winkie at linuxfromscratch.org winkie at linuxfromscratch.org
Wed Jun 2 11:31:50 PDT 2004


winkie      04/06/02 12:31:50

  Modified:    bootscripts CHANGELOG
               bootscripts/contrib/init.d hotplug
               bootscripts/lfs/init.d udev
  Log:
  Moved setting of /sbin/hotplug as the default hotplug manager into the
  hotplug boot script.
  
  Revision  Changes    Path
  1.94      +2 -0      LFS/bootscripts/CHANGELOG
  
  Index: CHANGELOG
  ===================================================================
  RCS file: /home/cvsroot/LFS/bootscripts/CHANGELOG,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- CHANGELOG	2 Jun 2004 13:37:47 -0000	1.93
  +++ CHANGELOG	2 Jun 2004 18:31:49 -0000	1.94
  @@ -1,6 +1,8 @@
   n/a - June 2, 2004
   
   	* Reorganize what goes on in the udev script
  +	* Moved setting /sbin/hotplug as the default hotplug manager into the
  +	  hotplug script
   
   n/a - June 1, 2004
   
  
  
  
  1.2       +7 -2      LFS/bootscripts/contrib/init.d/hotplug
  
  Index: hotplug
  ===================================================================
  RCS file: /home/cvsroot/LFS/bootscripts/contrib/init.d/hotplug,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- hotplug	17 May 2004 03:09:26 -0000	1.1
  +++ hotplug	2 Jun 2004 18:31:49 -0000	1.2
  @@ -6,8 +6,13 @@
   . /etc/sysconfig/rc
   . $rc_functions
   
  -# Assure that hotplug is actually present.
  -[ -x /sbin/hotplug ] || exit 0
  +# If hotplug is actually present, then set it to be the default manager of
  +# hotplug events, otherwise quietly exit.
  +if [ -x /sbin/hotplug ]; then
  +	echo /sbin/hotplug > /proc/sys/kernel/hotplug
  +else
  +	exit 0
  +fi
   
   case "$1" in
   	start|restart|status)
  
  
  
  1.5       +2 -3      LFS/bootscripts/lfs/init.d/udev
  
  Index: udev
  ===================================================================
  RCS file: /home/cvsroot/LFS/bootscripts/lfs/init.d/udev,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- udev	2 Jun 2004 13:37:47 -0000	1.4
  +++ udev	2 Jun 2004 18:31:49 -0000	1.5
  @@ -33,11 +33,10 @@
   
   		# When the hotplug package isn't installed, make sure that udev
   		# still gets hotplug events.
  -		if [ -x /sbin/hotplug ]; then
  -			echo /sbin/hotplug > /proc/sys/kernel/hotplug
  -		else
  +		if [ ! -x /sbin/hotplug ]; then
   			echo /sbin/udev > /proc/sys/kernel/hotplug
   		fi
  +
   		# Populate /dev with all the devices that are already available,
   		# and save it's status so we can report failures.
   		udevstart || failed=1
  
  
  



More information about the lfs-book mailing list