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

nathan at linuxfromscratch.org nathan at linuxfromscratch.org
Wed Jun 2 18:59:32 PDT 2004


nathan      04/06/02 19:59:32

  Modified:    bootscripts CHANGELOG
               bootscripts/contrib/init.d hotplug
               bootscripts/lfs/init.d udev
  Log:
  Just reorganized the error checking in udev and hotplug
  
  Revision  Changes    Path
  1.95      +1 -0      LFS/bootscripts/CHANGELOG
  
  Index: CHANGELOG
  ===================================================================
  RCS file: /home/cvsroot/LFS/bootscripts/CHANGELOG,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- CHANGELOG	2 Jun 2004 18:31:49 -0000	1.94
  +++ CHANGELOG	3 Jun 2004 01:59:31 -0000	1.95
  @@ -1,6 +1,7 @@
   n/a - June 2, 2004
   
   	* Reorganize what goes on in the udev script
  +	* Reorganize what goes on in the hotplug script
   	* Moved setting /sbin/hotplug as the default hotplug manager into the
   	  hotplug script
   
  
  
  
  1.3       +5 -5      LFS/bootscripts/contrib/init.d/hotplug
  
  Index: hotplug
  ===================================================================
  RCS file: /home/cvsroot/LFS/bootscripts/contrib/init.d/hotplug,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- hotplug	2 Jun 2004 18:31:49 -0000	1.2
  +++ hotplug	3 Jun 2004 01:59:32 -0000	1.3
  @@ -6,16 +6,16 @@
   . /etc/sysconfig/rc
   . $rc_functions
   
  -# 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 quietly if you do not have hotplug installed
  +if [ ! -x /sbin/hotplug ]; then
   	exit 0
   fi
   
   case "$1" in
   	start|restart|status)
  +		# Set hotplug as the default manager of hotplug events
  +		echo /sbin/hotplug > /proc/sys/kernel/hotplug
  +
   		echo "Loading modules for system devices..."
   		for rc in /etc/hotplug/*.rc; do
   			$rc $1
  
  
  
  1.6       +3 -5      LFS/bootscripts/lfs/init.d/udev
  
  Index: udev
  ===================================================================
  RCS file: /home/cvsroot/LFS/bootscripts/lfs/init.d/udev,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- udev	2 Jun 2004 18:31:49 -0000	1.5
  +++ udev	3 Jun 2004 01:59:32 -0000	1.6
  @@ -31,11 +31,9 @@
   		# want /dev to be unavailable (such as by `umount -a').
   		grep -q " /dev " /proc/mounts || mount -n -t ramfs ramfs /dev
   
  -		# When the hotplug package isn't installed, make sure that udev
  -		# still gets hotplug events.
  -		if [ ! -x /sbin/hotplug ]; then
  -			echo /sbin/udev > /proc/sys/kernel/hotplug
  -		fi
  +		# Assign udev to get hotplug events.  This will be overwritten
  +		# in the hotplug bootscript
  +		echo /sbin/udev > /proc/sys/kernel/hotplug
   
   		# Populate /dev with all the devices that are already available,
   		# and save it's status so we can report failures.
  
  
  



More information about the lfs-book mailing list