cvs commit: LFS/bootscripts/lfs/init.d hotplug sendsignals

winkie at linuxfromscratch.org winkie at linuxfromscratch.org
Mon Jun 21 17:51:26 PDT 2004


winkie      04/06/21 18:51:26

  Modified:    bootscripts CHANGELOG Makefile
               bootscripts/lfs/init.d hotplug sendsignals
  Log:
  Moved the disabling of hotplug from sendsignals to hotplug
  
  Revision  Changes    Path
  1.109     +4 -0      LFS/bootscripts/CHANGELOG
  
  Index: CHANGELOG
  ===================================================================
  RCS file: /home/cvsroot/LFS/bootscripts/CHANGELOG,v
  retrieving revision 1.108
  retrieving revision 1.109
  diff -u -r1.108 -r1.109
  --- CHANGELOG	22 Jun 2004 00:27:18 -0000	1.108
  +++ CHANGELOG	22 Jun 2004 00:51:26 -0000	1.109
  @@ -6,6 +6,10 @@
   	* Moved removal of /fastboot and /forcefsck to just after the root fs
   	  becomes writable, and dropped the removal of /etc/nologin
   	* Cleaned and tweaked both the output and actions of cleanfs
  +	* Removed the disabling of hotplug from sendsignals
  +	* Removed anything that might call "rmmod" in hotplug, since rmmod is
  +	  notoriously troublesome in the 2.6.x kernels, and call it with the
  +	  stop argument from runlevels 0 and 6
   
   n/a - June 20, 2004
   
  
  
  
  1.50      +2 -0      LFS/bootscripts/Makefile
  
  Index: Makefile
  ===================================================================
  RCS file: /home/cvsroot/LFS/bootscripts/Makefile,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- Makefile	21 Jun 2004 23:47:36 -0000	1.49
  +++ Makefile	22 Jun 2004 00:51:26 -0000	1.50
  @@ -39,6 +39,7 @@
   	install -m 754 lfs/init.d/udev         ${EXTDIR}/rc.d/init.d
   	ln -sf ../init.d/sysklogd    ${EXTDIR}/rc.d/rc0.d/K90sysklogd
   	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc0.d/K80network
  +	ln -sf ../init.d/hotplug     ${EXTDIR}/rc.d/rc0.d/S50hotplug
   	ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc0.d/S60sendsignals
   	ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rc0.d/S70mountfs
   	ln -sf ../init.d/swap        ${EXTDIR}/rc.d/rc0.d/S80swap
  @@ -56,6 +57,7 @@
   	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc5.d/S20network
   	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc6.d/K80network
   	ln -sf ../init.d/sysklogd    ${EXTDIR}/rc.d/rc6.d/K90sysklogd
  +	ln -sf ../init.d/hotplug     ${EXTDIR}/rc.d/rc0.d/S50hotplug
   	ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc6.d/S60sendsignals
   	ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rc6.d/S70mountfs
   	ln -sf ../init.d/swap        ${EXTDIR}/rc.d/rc6.d/S80swap
  
  
  
  1.2       +7 -7      LFS/bootscripts/lfs/init.d/hotplug
  
  Index: hotplug
  ===================================================================
  RCS file: /home/cvsroot/LFS/bootscripts/lfs/init.d/hotplug,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- hotplug	18 Jun 2004 22:31:30 -0000	1.1
  +++ hotplug	22 Jun 2004 00:51:26 -0000	1.2
  @@ -12,7 +12,7 @@
   case "$1" in
   	start|restart)
   		# Set hotplug as the default manager of hotplug events
  -		echo "/sbin/hotplug" > /proc/sys/kernel/hotplug
  +		echo /sbin/hotplug > /proc/sys/kernel/hotplug
   
   		echo "Loading modules for system devices..."
   		for rc in /etc/hotplug/*.rc; do
  @@ -22,13 +22,13 @@
   		;;
   	stop)
   		# Remove hotplug as the default manager of hotplug events
  -		echo "/bin/true" > /proc/sys/kernel/hotplug
  +		echo /bin/true > /proc/sys/kernel/hotplug
   
  -		echo "Unloading modules for system devices..."
  -		for rc in /etc/hotplug/*.rc; do
  -			$rc stop
  -		done
  -		print_status success
  +#		echo "Unloading modules for system devices..."
  +#		for rc in /etc/hotplug/*.rc; do
  +#			$rc stop
  +#		done
  +#		print_status success
   		;;
   	status)
   		for rc in /etc/hotplug/*.rc; do
  
  
  
  1.4       +0 -4      LFS/bootscripts/lfs/init.d/sendsignals
  
  Index: sendsignals
  ===================================================================
  RCS file: /home/cvsroot/LFS/bootscripts/lfs/init.d/sendsignals,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sendsignals	5 Jun 2004 03:01:37 -0000	1.3
  +++ sendsignals	22 Jun 2004 00:51:26 -0000	1.4
  @@ -9,10 +9,6 @@
   
   case "$1" in
   	stop)
  -		echo "Disabling Hotplug Events..."
  -		echo > /proc/sys/kernel/hotplug
  -		evaluate_retval
  -
   		echo "Sending all processes the TERM signal..."
   		killall5 -15
   		error_value=$?
  
  
  



More information about the lfs-book mailing list