cvs commit: LFS/bootscripts/lfs/sysconfig console

nathan at linuxfromscratch.org nathan at linuxfromscratch.org
Fri Jun 18 15:31:30 PDT 2004


nathan      04/06/18 16:31:30

  Modified:    bootscripts CHANGELOG Makefile
               bootscripts/lfs/sysconfig console
  Added:       bootscripts/lfs/init.d hotplug
  Removed:     bootscripts/contrib/init.d hotplug
  Log:
  hotplug installed by default, sysconfig/console updated
  
  Revision  Changes    Path
  1.103     +6 -0      LFS/bootscripts/CHANGELOG
  
  Index: CHANGELOG
  ===================================================================
  RCS file: /home/cvsroot/LFS/bootscripts/CHANGELOG,v
  retrieving revision 1.102
  retrieving revision 1.103
  diff -u -r1.102 -r1.103
  --- CHANGELOG	15 Jun 2004 16:36:31 -0000	1.102
  +++ CHANGELOG	18 Jun 2004 22:31:30 -0000	1.103
  @@ -1,3 +1,9 @@
  +n/a - June 18, 2004
  +
  +	* Updated sysconfig/console
  +	* Fixed disabling hotplug in sendsignals
  +	* hotplug is now installed by default
  +
   n/a - June 15, 2004
   
   	* Reset /proc/sys/kernel/hotplug to /bin/true when running the "stop"
  
  
  
  1.47      +2 -4      LFS/bootscripts/Makefile
  
  Index: Makefile
  ===================================================================
  RCS file: /home/cvsroot/LFS/bootscripts/Makefile,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- Makefile	9 Jun 2004 03:58:02 -0000	1.46
  +++ Makefile	18 Jun 2004 22:31:30 -0000	1.47
  @@ -14,6 +14,7 @@
   install: create-dirs create-service-dir
   	install -m 754 lfs/init.d/checkfs      ${EXTDIR}/rc.d/init.d/
   	install -m 754 lfs/init.d/cleanfs      ${EXTDIR}/rc.d/init.d/
  +	install -m 754 lfs/init.d/hotplug      ${EXTDIR}/rc.d/init.d
   	install -m 644 lfs/init.d/functions    ${EXTDIR}/rc.d/init.d/
   	install -m 754 lfs/init.d/halt         ${EXTDIR}/rc.d/init.d/
   	install -m 754 lfs/init.d/console      ${EXTDIR}/rc.d/init.d/
  @@ -59,6 +60,7 @@
   	ln -sf ../init.d/checkfs     ${EXTDIR}/rc.d/rcsysinit.d/S30checkfs
   	ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rcsysinit.d/S40mountfs
   	ln -sf ../init.d/cleanfs     ${EXTDIR}/rc.d/rcsysinit.d/S50cleanfs
  +	ln -sf ../init.d/hotplug     ${EXTDIR}/rc.d/rcsysinit.d/S55hotplug
   	ln -sf ../init.d/setclock    ${EXTDIR}/rc.d/rcsysinit.d/S60setclock
   	ln -sf ../init.d/console     ${EXTDIR}/rc.d/rcsysinit.d/S70console
   	ln -sf ../init.d/localnet    ${EXTDIR}/rc.d/rcsysinit.d/S80localnet
  @@ -70,10 +72,6 @@
   	install -m 754 lfs/sysconfig/network-devices/ifdown          ${EXTDIR}/sysconfig/network-devices
   	install -m 754 lfs/sysconfig/network-devices/services/static ${EXTDIR}/sysconfig/network-devices/services
   
  -install-hotplug: create-dirs
  -	install -m 754 contrib/init.d/hotplug ${EXTDIR}/rc.d/init.d
  -	ln -sf ../init.d/hotplug ${EXTDIR}/rc.d/rcsysinit.d/S55hotplug
  -
   install-modules: create-dirs
   	install -m 754 contrib/init.d/modules ${EXTDIR}/rc.d/init.d
   	install -m 644 contrib/sysconfig/modules ${EXTDIR}/sysconfig
  
  
  
  1.1                  LFS/bootscripts/lfs/init.d/hotplug
  
  Index: hotplug
  ===================================================================
  #!/bin/sh
  # Begin $rc_base/init.d/hotplug - Load modules for system devices
  
  # Written by Zack Winkles - winkie at linuxfromscratch.org
  
  . /etc/sysconfig/rc
  . $rc_functions
  
  # Exit quietly if you do not have hotplug installed
  [ -x /sbin/hotplug ] || exit 0
  
  case "$1" in
  	start|restart)
  		# 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
  		done
  		print_status success
  		;;
  	stop)
  		# Remove hotplug as the default manager of hotplug events
  		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
  		;;
  	status)
  		for rc in /etc/hotplug/*.rc; do
  			$rc status
  		done
  		;;
  	*)
  		echo "Usage: $0 {start|stop|restart|status}"
  		exit 1
  		;;
  esac
  
  # End $rc_base/init.d/hotplug
  
  
  
  1.7       +9 -5      LFS/bootscripts/lfs/sysconfig/console
  
  Index: console
  ===================================================================
  RCS file: /home/cvsroot/LFS/bootscripts/lfs/sysconfig/console,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- console	25 May 2004 05:04:48 -0000	1.6
  +++ console	18 Jun 2004 22:31:30 -0000	1.7
  @@ -1,11 +1,17 @@
   # Begin /etc/sysconfig/console
   # Uncomment the section corresponding to your country
   
  -# English-speaking users don't need this file at all, except when they
  +# US-English users don't need this file at all, except when they
   # use framebuffer console.
  -# For framebuffer users whose native language is English:
  +# For framebuffer users from USA or Australia:
   #
   # FONT="default8x16"
  +# WARNING: this is not the same as the kernel default font!
  +
  +# Users from Great Britain:
  +#
  +# KEYMAP="uk"
  +# FONT="iso01-16"
   
   # Belarussian users need to download additional fonts (TODO)
   
  @@ -30,8 +36,6 @@
   # Latvian users need to download additional files from
   # http://linux.ma-1.lv/ll10nt/Latvian-HOWTO/files/konsole-files.tar.gz
   
  -# Origin: http://www.zelow.no/floppyfw/download/packages/loadkeys/post-loadkeys-qwertz.ini
  -
   # Russia, one of many variants actually used
   # See the book for the contents of /etc/kbd/bs-sends-del
   #
  @@ -50,7 +54,7 @@
   # TODO: add Serbian Cyrillic settings
   
   # Spain, with Euro character (information from
  -# http://www.linuxforum.com/forums/index.php?showtopic=14590),
  +# http://www.linuxforum.com/forums/index.php?showtopic=14590)
   #
   # KEYMAP="es"
   # KEYMAP_CORRECTIONS="euro"
  
  
  



More information about the lfs-book mailing list