r1486 - in branches/udev_update: . packages packages/lfs-bootscripts packages/livecd-bootscripts

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Thu Apr 20 05:38:16 PDT 2006


Author: alexander
Date: 2006-04-20 06:38:15 -0600 (Thu, 20 Apr 2006)
New Revision: 1486

Added:
   branches/udev_update/packages/lfs-bootscripts/lfs-bootscripts-20060415-livecd-1.patch
   branches/udev_update/packages/livecd-bootscripts/
   branches/udev_update/packages/livecd-bootscripts/Makefile
   branches/udev_update/packages/livecd-bootscripts/clkconf
   branches/udev_update/packages/livecd-bootscripts/customize
   branches/udev_update/packages/livecd-bootscripts/font-errors.dat
   branches/udev_update/packages/livecd-bootscripts/font.dat
   branches/udev_update/packages/livecd-bootscripts/lang.dat
   branches/udev_update/packages/livecd-bootscripts/langconf
Removed:
   branches/udev_update/packages/lfs-bootscripts/clkconf
   branches/udev_update/packages/lfs-bootscripts/console.livecd
   branches/udev_update/packages/lfs-bootscripts/customize
   branches/udev_update/packages/lfs-bootscripts/font-errors.dat
   branches/udev_update/packages/lfs-bootscripts/font.dat
   branches/udev_update/packages/lfs-bootscripts/lang.dat
   branches/udev_update/packages/lfs-bootscripts/langconf
   branches/udev_update/packages/lfs-bootscripts/mountfs
   branches/udev_update/packages/lfs-bootscripts/udev
Modified:
   branches/udev_update/Makefile
   branches/udev_update/packages/lfs-bootscripts/Makefile
Log:
Updated LFS bootscripts, reorganized LiveCD-specific bootscripts.
Moved the "customize" script to S09 in order to be able to customize udev rules


Modified: branches/udev_update/Makefile
===================================================================
--- branches/udev_update/Makefile	2006-04-20 04:41:34 UTC (rev 1485)
+++ branches/udev_update/Makefile	2006-04-20 12:38:15 UTC (rev 1486)
@@ -325,6 +325,7 @@
 
 minimal-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs \
 	ch-lynx ch-libxml2 ch-expat ch-subversion ch-lfs-bootscripts \
+	ch-livecd-bootscripts \
 	ch-curl ch-zip ch-unzip ch-docbook-xml ch-libxslt ch-docbook-xsl \
 	ch-html_tidy ch-LFS-BOOK ch-openssh \
 	ch-dhcpcd ch-cpio ch-eject ch-nALFS ch-dialog ch-device-mapper \
@@ -333,7 +334,7 @@
 
 blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-nano ch-joe \
 	ch-screen ch-pkgconfig ch-libidn ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
-	ch-subversion ch-lfs-bootscripts ch-docbook-xml ch-libxslt \
+	ch-subversion ch-lfs-bootscripts ch-livecd-bootscripts ch-docbook-xml ch-libxslt \
 	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng ch-freetype \
 	ch-fontconfig ch-Xorg-modular ch-freefont ch-inputattach ch-fonts-dejavu \
 	ch-fonts-kochi ch-fonts-firefly ch-fonts-baekmuk ch-libjpeg ch-libtiff ch-libart_lgpl \
@@ -360,7 +361,7 @@
 
 blfs-minimal: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-nano ch-joe \
 	ch-screen ch-pkgconfig ch-libidn ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 \
-	ch-expat ch-subversion ch-lfs-bootscripts ch-docbook-xml ch-libxslt \
+	ch-expat ch-subversion ch-lfs-bootscripts ch-livecd-bootscripts ch-docbook-xml ch-libxslt \
 	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-openssh ch-glib2 ch-cvs \
 	ch-popt ch-samba ch-irssi ch-wireless_tools ch-tcpwrappers ch-portmap \
 	ch-nfs-utils ch-traceroute ch-rsync ch-jhalfs ch-sudo ch-dialog ch-ncftp \
@@ -379,6 +380,7 @@
 
 x86_64-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-nano ch-joe ch-screen ch-pkgconfig ch-libidn ch-curl \
 	ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat ch-subversion ch-lfs-bootscripts \
+	ch-livecd-bootscripts \
 	ch-docbook-xml ch-libxslt ch-docbook-xsl ch-html_tidy cd-LFS-BOOK ch-cpio \
 	ch-man-fr ch-man-pages-es ch-man-pages-it ch-manpages-de ch-manpages-ru \
 	ch-linux ch-ctags ch-device-mapper ch-initramfs ch-cdrtools ch-zisofs-tools \
@@ -386,7 +388,7 @@
 
 sparc64-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-nano \
 	ch-joe ch-screen ch-pkgconfig ch-libidn ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
-	ch-subversion ch-lfs-bootscripts ch-docbook-xml ch-libxslt \
+	ch-subversion ch-lfs-bootscripts ch-livecd-bootscripts ch-docbook-xml ch-libxslt \
 	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-openssh \
 	ch-glib2 ch-cvs ch-popt ch-samba ch-tcpwrappers \
 	ch-portmap ch-nfs-utils ch-traceroute ch-dialog ch-ncftp ch-pciutils \

Modified: branches/udev_update/packages/lfs-bootscripts/Makefile
===================================================================
--- branches/udev_update/packages/lfs-bootscripts/Makefile	2006-04-20 04:41:34 UTC (rev 1485)
+++ branches/udev_update/packages/lfs-bootscripts/Makefile	2006-04-20 12:38:15 UTC (rev 1486)
@@ -1,13 +1,15 @@
 # LFS-Bootscripts Makefile
 
 NM= lfs-bootscripts
-VRS= udev_update-20060321
+VRS= 20060415
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
-URL-$(FILE)= http://www.linuxfromscratch.org/~dj/bootscripts//$(FILE)
-SHA-$(FILE)= 4a82d38ab8738dd2516e4e288278edf8aca68eb6
+URL-$(FILE)= http://www.linuxfromscratch.org/~dj/bootscripts/$(FILE)
+SHA-$(FILE)= dc986b4e8f15394d826944fcd18f964961ce89b9
 
+PATCH1= $(DIR)-livecd-1.patch
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -21,26 +23,8 @@
 	cp $(SRC)/$(FILE) $(LFSSRC)
 
 compile-stage2:
-	sed -i s/sane/cooked/ lfs/init.d/functions
+	patch -Np1 -i ../$(PATCH1)
 	make install-livecd
-	install -m 755 lfs/init.d/mountkernfs /etc/rc.d/init.d
-	ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs
-	install -m 755 ../udev /etc/rc.d/init.d/
-	ln -sf ../init.d/udev /etc/rc.d/rcsysinit.d/S10udev
-	install -m 755 ../mountfs /etc/rc.d/init.d/
-	ln -sf ../init.d/mountfs /etc/rc.d/rcsysinit.d/S40mountfs
-	install -m 755 ../customize /etc/rc.d/init.d/
-	ln -sf ../init.d/customize /etc/rc.d/rcsysinit.d/S41customize
-	install -m 755 ../clkconf /etc/rc.d/init.d/
-	ln -sf ../init.d/clkconf /etc/rc.d/rcsysinit.d/S59clkconf
-	install -m 755 ../langconf /etc/rc.d/init.d/
-	ln -sf ../init.d/langconf /etc/rc.d/rcsysinit.d/S69langconf
-	mkdir -p /etc/langconf
-	install -m 644 ../*.dat /etc/langconf
-	install -m 755 ../console.livecd /etc/rc.d/init.d/console
-	rm -f /etc/rc.d/rc0.d/S99halt
-	rm -f /etc/rc.d/rc6.d/S99reboot
-	rm -f /etc/rc.d/*/*mountsqfs /etc/rc.d/*/*startup /etc/rc.d/*/*hotplug
 
 clean:
 	-rm -rf $(DIR)

Deleted: branches/udev_update/packages/lfs-bootscripts/clkconf
===================================================================
--- branches/udev_update/packages/lfs-bootscripts/clkconf	2006-04-20 04:41:34 UTC (rev 1485)
+++ branches/udev_update/packages/lfs-bootscripts/clkconf	2006-04-20 12:38:15 UTC (rev 1486)
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# Get a well-defined sorting order
-LC_ALL=C
-export LC_ALL
-
-if [ ! -z "$TZ" ] ; then
-	# Assume that the system clock is already configured,
-	# e.g. from boot prompt
-	exit 0
-fi
-
-DLG_COMMAND="dialog --title \"Configure system clock\" \
-        --default-item \"GMT\" --timeout 20 \
-	--menu \"Select your timezone from the list below\" 0 0 0 \
-	`find /usr/share/zoneinfo/posix -type f | \
-	sed -e 's,/usr/share/zoneinfo/posix/,,' -e 's,$, "",' | sort`"
-TZ_SELECTED=`eval $DLG_COMMAND 3>&2 2>&1 1>&3`
-
-if [ $? -ne 0 ] ; then
-	# The user really doesn't want to configure system clock
-	exit 0
-fi
-
-echo "TZ=$TZ_SELECTED" >>/etc/environment
-echo "TZ=$TZ_SELECTED ; export TZ" >>/etc/sysconfig/rc
-echo "TZ=$TZ_SELECTED ; export TZ" >>/etc/profile
-
-dialog --yes-label "Localtime" --no-label "GMT" \
-	--title 'Configure system clock' \
-	--yesno "Is the system clock set to local time or to GMT?" -1 -1
-
-UTC_SELECTED=$?
-
-case "$UTC_SELECTED" in
-0|1)
-	echo "UTC=$UTC_SELECTED" >/etc/sysconfig/clock
-esac
-
-# Just to avoid useless warnings
-exit 0

Deleted: branches/udev_update/packages/lfs-bootscripts/console.livecd
===================================================================
--- branches/udev_update/packages/lfs-bootscripts/console.livecd	2006-04-20 04:41:34 UTC (rev 1485)
+++ branches/udev_update/packages/lfs-bootscripts/console.livecd	2006-04-20 12:38:15 UTC (rev 1486)
@@ -1,104 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/console
-#
-# Description : Sets keymap and screen font
-#
-# Authors     : Gerard Beekmans - gerard at linuxfromscratch.org
-#		Alexander E. Patrakov
-#
-# Version     : 00.03
-#
-# Notes       :
-#
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-# Native English speakers probably don't have /etc/sysconfig/console at all
-if [ -f /etc/sysconfig/console ]
-then
-	. /etc/sysconfig/console
-fi
-
-is_true() {
-	[ "$1" = "1" ] || [ "$1" = "yes" ] || [ "$1" = "true" ]
-}
-
-failed=0
-trap failed=1 ERR
-
-case "${1}" in
-	start)
-		boot_mesg "Setting up Linux console..."
-		# There should be no bogus failures below this line!
-		
-		# Figure out if a framebuffer console is used
-		[ -d /sys/class/graphics/fb0 ] && USE_FB=1 || USE_FB=0
-		
-		# Figure out the command to set the console into the
-		# desired mode
-		is_true "${UNICODE}" &&
-			MODE_COMMAND="echo -en '\033%G' && kbd_mode -u" ||
-			MODE_COMMAND="echo -en '\033%@\033(K' && kbd_mode -a"
-		
-		# On framebuffer consoles, font has to be set for each vt in
-		# UTF-8 mode. This doesn't hurt in non-UTF-8 mode also.
-		
-		! is_true "${USE_FB}" || [ -z "${FONT}" ] ||
-			MODE_COMMAND="${MODE_COMMAND} && setfont ${FONT}"
-
-		# Apply that command to all consoles mentioned in
-		# /etc/inittab. Important: in the UTF-8 mode this should
-		# happen before setfont, otherwise a kernel bug will
-		# show up and the unicode map of the font will not be
-		# used.
-		# FIXME: Fedora Core also initializes two spare consoles
-		# - do we want that?
-		
-		# for TTY in `grep '^[^#].*respawn:/sbin/agetty' /etc/inittab |
-		# 	grep -o '\btty[[:digit:]]*\b'`
-		#
-		# XXX Livecd doesn't use agetty, so the statement above
-		# doesn't work
-		for TTY in 1 2 3 4 5 6
-		do
-			openvt -f -w -c ${TTY#tty} -- \
-				/bin/sh -c "${MODE_COMMAND}"
-		done
-
-		# Set the font (if not already set above) and the keymap
-		is_true "${USE_FB}" || 	[ -z "${FONT}" ] || setfont $FONT
-		[ -z "${KEYMAP}" ] || loadkeys ${KEYMAP} &>/dev/null
-		[ -z "${KEYMAP_CORRECTIONS}" ] ||
-			loadkeys ${KEYMAP_CORRECTIONS} &>/dev/null
-
-		# Linux kernel generates wrong bytes when composing
-		# in Unicode mode. That's why we disable dead keys in Unicode
-		# mode by default. If you need them, download and apply
-		# http://www.linuxfromscratch.org/~alexander/patches/linux-2.6.12.5-utf8_input-2.patch
-		# After patching, add "-m charset_of_your_keymap" to the FONT
-		# variable and set BROKEN_COMPOSE=false
-		# in /etc/sysconfig/console
-
-		[ -n "$BROKEN_COMPOSE" ] || BROKEN_COMPOSE="$UNICODE"
-		! is_true "$BROKEN_COMPOSE" ||
-			echo "" | loadkeys -c &>/dev/null
-		
-		# Convert the keymap from $LEGACY_CHARSET to UTF-8
-		[ -z "$LEGACY_CHARSET" ] ||
-			dumpkeys -c "$LEGACY_CHARSET" | loadkeys -u &>/dev/null
-
-		# If any of the commands above failed, the trap at the
-		# top would set $failed to 1
-		( exit $failed )
-		evaluate_retval
-		;;
-	*)
-		echo $"Usage:" "${0} {start}"
-		exit 1
-		;;
-esac
-
-# End $rc_base/init.d/console

Deleted: branches/udev_update/packages/lfs-bootscripts/customize
===================================================================
--- branches/udev_update/packages/lfs-bootscripts/customize	2006-04-20 04:41:34 UTC (rev 1485)
+++ branches/udev_update/packages/lfs-bootscripts/customize	2006-04-20 12:38:15 UTC (rev 1486)
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# this script runs before "console",
-# thus translated error messages are not allowed
-
-LC_ALL=C
-export LC_ALL
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-case "${1}" in
-	start)
-		boot_mesg "Applying CD customizations..."
-		cd /
-		cat /dev/shm/.cdrom/.remove 2>/dev/null | xargs rm -rvf
-		cd /dev/shm/.cdrom
-		find . ! -path ./root.ext2 ! -path ./boot\* ! -path ./.remove | \
-			cpio -pvd / 2>&1 | sed 's,^//\.,,'
-		echo_ok
-		;;
-	*)
-		echo "Usage: ${0} {start}"
-		exit 1
-		;;
-esac

Deleted: branches/udev_update/packages/lfs-bootscripts/font-errors.dat
===================================================================
--- branches/udev_update/packages/lfs-bootscripts/font-errors.dat	2006-04-20 04:41:34 UTC (rev 1485)
+++ branches/udev_update/packages/lfs-bootscripts/font-errors.dat	2006-04-20 12:38:15 UTC (rev 1486)
@@ -1,4 +0,0 @@
-All non-ASCII characters will be treated as non-printable\nuntil you set locale to something other than "C".
-Some characters are missing from the console font.\nType "startx" to start the X session after login.
-Your language is supported in X window system only.\nType "startx" to start the X session after login.
-Your language is completely unsupported on this CD.\nIt is a bug, but we don't know how to fix it.\nPlease mail instructions to livecd at linuxfromscratch.org

Deleted: branches/udev_update/packages/lfs-bootscripts/font.dat
===================================================================
--- branches/udev_update/packages/lfs-bootscripts/font.dat	2006-04-20 04:41:34 UTC (rev 1485)
+++ branches/udev_update/packages/lfs-bootscripts/font.dat	2006-04-20 12:38:15 UTC (rev 1486)
@@ -1,33 +0,0 @@
-# Charset	FONT				ERRORCODE (from font-errors.dat)
-ANSI_X3.4-1968	default8x16			1
-BIG5		default8x16			3
-BIG5-HKSCS	default8x16			3
-CP1251		cyr-sun16 -m cp1251		0
-CP1255		LatArCyrHeb-16 -m 8859-8	2
-EUC-JP		default8x16			3
-EUC-KR		default8x16			3
-EUC-TW		default8x16			3
-GB18030		default8x16			3
-GB2312		default8x16			3
-GBK		default8x16			3
-GEORGIAN-PS	default8x16			4
-ISO-8859-1	lat1-16 -m 8859-1		0
-ISO-8859-2	lat2-16 -m 8859-2		0
-ISO-8859-3	LatArCyrHeb-16 -m 8859-3	0
-ISO-8859-5	cyr-sun16 -m 8859-5		0
-ISO-8859-6	LatArCyrHeb-16 -m 8859-6	0
-ISO-8859-7	iso07u-16 -m 8859-7		0
-ISO-8859-8	LatArCyrHeb-16 -m 8859-8	0
-ISO-8859-9	cp857.16 -u cp857 -m 8859-9	0
-ISO-8859-10	LatArCyrHeb-16 -m 8859-10	0
-ISO-8859-13	LatArCyrHeb-16 -m 8859-13	0
-ISO-8859-14	default8x16			3
-ISO-8859-15	lat0-16 -m 8859-15		0
-KOI8-R		cyr-sun16 -m koi8-r		0
-KOI8-T		cyr-sun16 -m koi8-r		2
-KOI8-U		cyr-sun16 -m koi8-u		0
-PT154		cyr-sun16 -m cp1251		2
-# FIXME: "tis-ptsmall.f16 -m tis620" may be more readable
-TIS-620		tis-phaisarn.f16 -m tis620	0
-# This catches all essentially-UTF-8 scripts like Indic ones.
-UTF-8		LatArCyrHeb-16			4

Deleted: branches/udev_update/packages/lfs-bootscripts/lang.dat
===================================================================
--- branches/udev_update/packages/lfs-bootscripts/lang.dat	2006-04-20 04:41:34 UTC (rev 1485)
+++ branches/udev_update/packages/lfs-bootscripts/lang.dat	2006-04-20 12:38:15 UTC (rev 1486)
@@ -1,78 +0,0 @@
-# DESCRIPTION				LANG		KEYMAP		LEGACY_CHARSET	XKEYMAP
-Default/Other				C		""		""		"us"
-English,_USA_(ISO-8859-1)		en_US		""		""		"us"
-English,_USA_(UTF-8)			en_US.UTF-8	""		"iso-8859-1"	"us"
-English,_GB_(ISO-8859-1)		en_GB		"gb"		""		"uk"
-English,_GB_(UTF-8)			en_GB.UTF-8	"gb"		"iso-8859-1"	"uk"
-English,_Australia_(ISO-8859-1)		en_AU		""		""		"us"
-English,_Australia_(UTF-8)		en_AU.UTF-8	""		"iso-8859-1"	"us"
-
-Belarusian_(CP1251)			be_BY		"by2_win"	""		"us,by(winkeys)"
-Belarusian_(UTF-8)			be_BY.UTF-8	"by"		"iso-8859-5"	"us,by(winkeys)"
-Brazilian,_ABNT2_keymap_(ISO-8859-1)	pt_BR		"br-abnt2"	""		"br-abnt2"
-Brazilian,_ABNT2_keymap_(UTF-8)		pt_BR.UTF-8	"br-abnt2"	"iso-8859-1"	"br-abnt2"
-Bulgarian_(CP1251)			bg_BG		"bg_bds-cp1251"	""		"us,bds_enhanced"
-Bulgarian_(UTF-8)			bg_BG.UTF-8	"bg_bds-utf8"	""		"us,bds_enhanced"
-Chinese_(Traditional,_BIG5)		zh_TW		""		""		"us"
-Chinese_(Traditional,_EUC-TW)		zh_TW.EUC-TW	""		""		"us"
-Chinese_(Traditional,_UTF-8)		zh_TW.UTF-8	""		""		"us"
-Chinese_(Simplified,_GB2312)		zh_CN		""		""		"us"
-Chinese_(Simplified,_GB18030)		zh_CN.GB18030	""		""		"us"
-Chinese_(Simplified,_GBK)		zh_CN.GBK	""		""		"us"
-Chinese_(Simplified,_UTF-8)		zh_CN.UTF-8	""		""		"us"
-Czech_(ISO-8859-2)			cs_CZ		"cz"		""		"cz"
-Czech_(UTF-8)				cs_CZ.UTF-8	"cz"		"iso-8859-2"	"cz"
-Danish_(ISO-8859-1)			da_DK		"dk-latin1"	""		"dk"
-Danish_(UTF-8)				da_DK.UTF-8	"dk-latin1"	"iso-8859-1"	"dk"
-Finnish_(ISO-8859-1)			fi_FI		"fi-latin1"	""		"fi"
-Finnish_(ISO-8859-15)			fi_FI at euro	"fi-latin9"	""		"fi"
-Finnish_(UTF-8)				fi_FI.UTF-8	"fi-latin9"	"iso-8859-15"	"fi"
-French_(ISO-8859-1)			fr_FR		"fr-latin1"	""		"fr"
-French_(ISO-8859-15)			fr_FR at euro	"fr-latin9"	""		"fr"
-French_(UTF-8)				fr_FR.UTF-8	"fr-latin9"	"iso-8859-15"	"fr"
-French_(Canada,_ISO-8859-1)		fr_CA		"cf"		""		"ca_enhanced"
-French_(Canada,_UTF-8)			fr_CA.UTF-8	"cf"		"iso-8859-1"	"ca_enhanced"
-German_(ISO-8859-1)			de_DE		"de-latin1"	""		"de"
-German_(ISO-8859-15)			de_DE at euro	"de-latin1+euro2" ""		"de"
-German_(UTF-8)				de_DE.UTF-8	"de-latin1+euro2" "iso-8859-15"	"de"
-Greek_(ISO-8859-7)			el_GR		"gr"		""		"us,el"
-Greek_(UTF-8)				el_GR.UTF-8	"gr"		"iso-8859-7"	"us,el"
-Hungarian_(ISO-8859-2)			hu_HU		"hu101"		""		"hu"
-Hungarian_(UTF-8)			hu_HU.UTF-8	"hu101"		"iso-8859-2"	"hu"
-Icelandic_(ISO-8859-1)			is_IS		"is-latin1"	""		"is"
-Icelandic_(UTF-8)			is_IS.UTF-8	"is-latin1"	"iso-8859-1"	"is"
-Japanese_(EUC-JP)			ja_JP		""		""		"us"
-Japanese_(UTF-8)			ja_JP.UTF-8	""		""		"us"
-Korean_(EUC-KR)				ko_KR		""		""		"us"
-Korean_(UTF-8)				ko_KR.UTF-8	""		""		"us"
-Norwegian,_Bokmal_(ISO-8859-1)		nb_NO		"no-latin1"	""		"no"
-Norwegian,_Bokmal_(UTF-8)		nb_NO.UTF-8	"no-latin1"	"iso-8859-1"	"no"
-Norwegian,_Nynorsk_(ISO-8859-1)		nn_NO		"no-latin1"	""		"no"
-Norwegian,_Nynorsk_(UTF-8)		nn_NO.UTF-8	"no-latin1"	"iso-8859-1"	"no"
-Polish_(ISO-8859-2)			pl_PL		"pl"		""		"pl2"
-Polish_(UTF-8)				pl_PL.UTF-8	"pl"		"iso-8859-2"	"pl2
-Portuguese_(ISO-8859-1)			pt_PT		"pt-latin1"	""		"pt"
-Portuguese_(ISO-8859-15)		pt_PT at euro	"pt-latin9"	""		"pt"
-Portuguese_(UTF-8)			pt_PT.UTF-8	"pt-latin9"	"iso-8859-15"	"pt"
-Russian_(CP1251)			ru_RU.CP1251	"ru_win"	""		"us,ru(winkeys)"
-Russian_(KOI8-R)			ru_RU.KOI8-R	"ru-ms"		""		"us,ru(winkeys)"
-Russian_(UTF-8)				ru_RU.UTF-8	"ru-ms"		"koi8-r"	"us,ru(winkeys)"
-Slovak,_QWERTZ_keyboard_(ISO-8859-2)	sk_SK		"sk-qwertz"	""		"sk"
-Slovak,_QWERTZ_keyboard_(UTF-8)		sk_SK.UTF-8	"sk-qwertz"	"iso-8859-2"	"sk"
-Slovak,_QWERTY_keyboard_(ISO-8859-2)	sk_SK		"sk-qwerty"	""		"sk_qwerty"
-Slovak,_QWERTY_keyboard_(UTF-8)		sk_SK.UTF-8	"sk-qwerty"	"iso-8859-2"	"sk_qwerty"
-Spanish_(ISO-8859-1)			es_ES		"es"		""		"es"
-Spanish_(ISO-8859-15)			es_ES at euro	"es+euro2"	""		"es"
-Spanish_(UTF-8)				es_ES.UTF-8	"es+euro2"	"iso-8859-15"	"es"
-Spanish,_Mexico_(ISO-8859-1)		es_MX		"la-latin1"	""		"la"
-Spanish,_Mexico_(UTF-8)			es_MX.UTF-8	"la-latin1"	"iso-8859-1"	"la"
-Swedish_(ISO-8859-1)			sv_SE		"sv-latin1"	""		"se"
-Swedish_(UTF-8)				sv_SE.UTF-8	"sv-latin1"	"iso-8859-1"	"se"
-Thai_(TIS-620)				th_TH		"th-win-latin1"	""		"us,th"
-Thai_(UTF-8)				th_TH.UTF-8	"th-win-uni"	""		"us,th"
-Turkish,_F_keyboard_(ISO-8859-9)	tr_TR		"trf"		""		"tr_f"
-Turkish,_F_keyboard_(UTF-8)		tr_TR.UTF-8	"trf"		"iso-8859-9"	"tr_f"
-Turkish,_Q_keyboard_(ISO-8859-9)	tr_TR		"tr_q-latin5"	""		"tr"
-Turkish,_Q_keyboard_(UTF-8)		tr_TR.UTF-8	"tr_q-latin5"	"iso-8859-9"	"tr"
-Ukrainian_(KOI8-U)			uk_UA		"ua-ws"		""		"us,ua(winkeys)"
-Ukrainian_(UTF-8)			uk_UA.UTF-8	"ua-utf-ws"	""		"us,ua(winkeys)"

Deleted: branches/udev_update/packages/lfs-bootscripts/langconf
===================================================================
--- branches/udev_update/packages/lfs-bootscripts/langconf	2006-04-20 04:41:34 UTC (rev 1485)
+++ branches/udev_update/packages/lfs-bootscripts/langconf	2006-04-20 12:38:15 UTC (rev 1486)
@@ -1,191 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/langconf
-#
-# Description : Language and Keymap Configuration Script for the Live CD
-#
-# Authors     : Alexander E. Patrakov
-#
-# Version     : 00.00
-#
-# Notes       :
-#
-########################################################################
-
-SELECTED=
-
-DATABASE=/etc/langconf/lang.dat
-FONTDB=/etc/langconf/font.dat
-ERRDB=/etc/langconf/font-errors.dat
-
-F_ERROR=0
-
-same_locale() {
-	for term in language territory charmap
-	do
-		[ "`LC_ALL=$1 locale $term`" = "`LC_ALL=$2 locale $term`" ] || return 1
-	done
-	return 0
-}
-
-guess_selection() {
-	while read F_DESCRIPTION F_LANG F_KEYMAP F_LEGACYCHARSET F_XKEYMAP
-	do
-		if [ -z "$F_DESCRIPTION" ] || [ "$F_DESCRIPTION" = "#" ]
-		then
-			continue
-		fi
-		F_KEYMAP="${F_KEYMAP//\"/}"
-		F_KEYMAP="${F_KEYMAP//+/ }"
-		F_LEGACYCHARSET="${F_LEGACYCHARSET//\"/}"
-		F_XKEYMAP="${F_XKEYMAP//\"/}"
-		same_locale "$F_LANG" "$LANG" && SELECTED="$F_DESCRIPTION" && return 0
-	done <$DATABASE
-	F_LANG="$LANG"
-	F_KEYMAP=defkeymap
-	F_LEGACYCHARSET=""
-	F_XKEYMAP="us"
-	return 1
-}
-
-get_selection_dlg() {
-	ARGS=""
-	while read F_DESCRIPTION F_JUNK
-	do
-		if [ -z "$F_DESCRIPTION" ] || [ "$F_DESCRIPTION" = "#" ]
-		then
-			continue
-		fi
-		DESCRIPTION=`echo $F_DESCRIPTION | tr _ ' '`
-		ARGS="$ARGS \"$DESCRIPTION\" \"\""
-	done <$DATABASE
-	DLG_COMMAND="dialog --title \"Regional settings\" --timeout 20 \
-	--default-item \"Default/Other\" \
-	--menu \"Choose your locale\" -1 0 0 $ARGS"
-	SELECTED=`eval $DLG_COMMAND 3>&2 2>&1 1>&3`
-
-	if [ $? -ne 0 ] ; then
-		exit 0
-	fi
-}
-
-guess_font() {
-	# Select font that has all characters in the language
-	# Base the selection on the language's non-UTF-8 locale charmap
-	F_CHARMAP=`LC_ALL=${F_LANG%.UTF-8} locale charmap`
-	while IFS="	" read CHARMAP FONT ERROR
-	do
-		if [ "$F_CHARMAP" = "$CHARMAP" ]
-		then
-			F_FONT="$FONT"
-			F_ERROR="$ERROR"
-			if [ "$F_ERROR" != "0" ]
-			then
-				echo -e `sed -n "${F_ERROR}p" $ERRDB`
-				sleep 5
-			fi
-		fi
-	done <$FONTDB
-	
-	# If UTF-8 locale is used, drop any "-m" flag
-	case "$F_LANG" in
-	*.UTF-8)
-		F_FONT=${F_FONT% -m*}
-		;;
-	esac
-}
-
-confirm() {
-	# TODO: simplify life for Dvorak users. They have to edit
-	# this using (awkward) qwerty keymap!
-	
-	DLG_COMMAND="dialog --title \"Confirm/edit settings\" \
-	--no-cancel \
-	--form \"Please review and, if necessary, edit the settings below.
-\n\nKeymap autoconversion is used only together with UTF-8 locales.
-If you don't need to convert your keymap to UTF-8 (e.g. because it
-is already in UTF-8, or because you don't want UTF-8), don't fill in
-that field.
-\n\nIn order to enhance Unicode coverage of the Linux console at the
-cost of unavailable bright colors, use the LatArCyrHeb-16 font.\" 0 0 5 \
-	\"Locale:\" 1 1 \"$F_LANG\" 1 30 40 0 \
-	\"Console keymap:\" 2 1 \"$F_KEYMAP\" 2 30 40 0 \
-	\"  autoconverted from charset:\" 3 1 \"$F_LEGACYCHARSET\" 3 30 40 0 \
-	\"Console font:\" 4 1 \"$F_FONT\" 4 30 40 0 \
-	\"X keymap:\" 5 1 \"$F_XKEYMAP\" 5 30 40 0"
-	SELECTION=`eval $DLG_COMMAND 3>&2 2>&1 1>&3`
-	STATUS=$?
-	[ "$STATUS" != 0 ] && exit 1
-	eval "`echo "$SELECTION" | \
-		sed -e '1s,^,F_LANG=",' \
-		-e '2s,^,F_KEYMAP=",' \
-		-e '3s,^,F_LEGACYCHARSET=",' \
-		-e '4s,^,F_FONT=",' \
-		-e '5s,^,F_XKEYMAP=",' | sed -e 's,$,",'`"
-	return 0
-}
-
-interactive_config() {
-	get_selection_dlg
-	F_SELECTED=`echo $SELECTED | tr ' ' _`
-	LINE=`grep "^$F_SELECTED" $DATABASE | sed 's,[[:space:]]\+,\n,g'`
-	eval "`echo "$LINE" | sed -e 's,+, ,g' -e 's,",,g' | \
-		sed -e '1d' \
-		-e '2s,^,F_LANG=",' \
-		-e '3s,^,F_KEYMAP=",' \
-		-e '4s,^,F_LEGACYCHARSET=",' \
-		-e '5s,^,F_XKEYMAP=",' | sed -e 's,$,",'`"
-	[ -z "$F_KEYMAP" ] && F_KEYMAP=defkeymap
-	guess_font
-	[ -z "$F_XKEYMAP" ] && F_XKEYMAP=us
-	confirm
-}
-
-noninteractive_config() {
-	guess_selection
-	F_LANG="$LANG"
-	guess_font
-	# Accept overrides to our guesses if given on the command line
-	[ -z "$F_KEYMAP" ] && F_KEYMAP=defkeymap
-	[ -z "$F_XKEYMAP" ] && F_XKEYMAP=us
-	[ -n "$KEYMAP" ] && F_KEYMAP=${KEYMAP//+/ }
-	[ -n "$FONT" ] && F_FONT=${FONT//+/ }
-	[ -n "$LEGACY_CHARSET" ] && F_LEGACYCHARSET=$LEGACY_CHARSET
-	[ -n "$XKEYMAP" ] && F_XKEYMAP=$XKEYMAP
-}
-
-# Assume that noninteractive configuration is wanted if LANG is set
-if [ -n "$LANG" ]
-then
-	noninteractive_config
-else
-	interactive_config
-fi
-
-# Write the settings out to configuration files
-echo "LANG=\"$F_LANG\" ; export LANG" >>/etc/profile
-
-echo "KEYMAP=\"$F_KEYMAP\"" >/etc/sysconfig/console
-
-if [ "`LC_ALL="$F_LANG" locale charmap`" = "UTF-8" ]
-then
-	echo "UNICODE=1" >>/etc/sysconfig/console
-	echo "BROKEN_COMPOSE=0" >>/etc/sysconfig/console
-	if [ -n "$F_LEGACYCHARSET" ]
-	then
-		echo "FONT=\"$F_FONT -m ${F_LEGACYCHARSET#iso-}\"" >>/etc/sysconfig/console
-		echo "LEGACY_CHARSET=\"$F_LEGACYCHARSET\"" >>/etc/sysconfig/console
-	else
-		echo "FONT=\"$F_FONT\"" >>/etc/sysconfig/console
-	fi
-else
-	echo "FONT=\"$F_FONT\"" >>/etc/sysconfig/console
-fi
-
-sed -i "s/\"us\"/\"$F_XKEYMAP\"/" /etc/X11/xorg.conf
-
-if [ "$F_ERROR" = "3" ]
-then
-	echo '[ "$TERM" = "linux" ] && LC_ALL=C' >>/etc/profile
-	echo 'export LC_ALL' >>/etc/profile
-fi

Added: branches/udev_update/packages/lfs-bootscripts/lfs-bootscripts-20060415-livecd-1.patch
===================================================================
--- branches/udev_update/packages/lfs-bootscripts/lfs-bootscripts-20060415-livecd-1.patch	                        (rev 0)
+++ branches/udev_update/packages/lfs-bootscripts/lfs-bootscripts-20060415-livecd-1.patch	2006-04-20 12:38:15 UTC (rev 1486)
@@ -0,0 +1,110 @@
+diff -urN lfs-bootscripts-20060415.orig/lfs/init.d/console lfs-bootscripts-20060415/lfs/init.d/console
+--- lfs-bootscripts-20060415.orig/lfs/init.d/console	2005-12-26 06:28:48.000000000 +0500
++++ lfs-bootscripts-20060415/lfs/init.d/console	2006-04-20 15:18:02.000000000 +0600
+@@ -57,8 +57,12 @@
+ 		# FIXME: Fedora Core also initializes two spare consoles
+ 		# - do we want that?
+ 		
+-		for TTY in `grep '^[^#].*respawn:/sbin/agetty' /etc/inittab |
+-			grep -o '\btty[[:digit:]]*\b'`
++		# for TTY in `grep '^[^#].*respawn:/sbin/agetty' /etc/inittab |
++		# 	grep -o '\btty[[:digit:]]*\b'`
++		#
++		# XXX Livecd doesn't use agetty, so the statement above
++		# doesn't work
++		for TTY in 1 2 3 4 5 6
+ 		do
+ 			openvt -f -w -c ${TTY#tty} -- \
+ 				/bin/sh -c "${MODE_COMMAND}"
+diff -urN lfs-bootscripts-20060415.orig/lfs/init.d/udev lfs-bootscripts-20060415/lfs/init.d/udev
+--- lfs-bootscripts-20060415.orig/lfs/init.d/udev	2006-04-14 07:56:36.000000000 +0600
++++ lfs-bootscripts-20060415/lfs/init.d/udev	2006-04-20 15:18:02.000000000 +0600
+@@ -18,41 +18,13 @@
+ case "${1}" in
+ 	start)
+ 		boot_mesg "Populating /dev with device nodes..."
+-		if ! grep -q '[[:space:]]sysfs' /proc/mounts; then
+-			echo_failure
+-			boot_mesg -n "FAILURE:\n\nUnable to create" ${FAILURE}
+-			boot_mesg -n " devices without a SysFS filesystem"
+-			boot_mesg -n "\n\nAfter you press Enter, this system"
+-			boot_mesg -n " will be halted and powered off."
+-			boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
+-			boot_mesg "" ${NORMAL}
+-			read ENTER
+-			/etc/rc.d/init.d/halt stop
+-		fi
+-
+-		# Mount a temporary file system over /dev, so that any devices
+-		# made or removed during this boot don't affect the next one.
+-		# The reason we don't write to mtab is because we don't ever
+-		# want /dev to be unavailable (such as by `umount -a').
+-		mount -n -t tmpfs tmpfs /dev -o mode=755
+-		if [ ${?} != 0 ]; then
+-			echo_failure
+-			boot_mesg -n "FAILURE:\n\nCannot mount a tmpfs" ${FAILURE}
+-			boot_mesg -n " onto /dev, this system will be halted."
+-			boot_mesg -n "\n\nAfter you press Enter, this system"
+-			boot_mesg -n " will be halted and powered off."
+-			boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
+-			boot_mesg "" ${NORMAL}
+-			read ENTER
+-			/etc/rc.d/init.d/halt stop
+-		fi
+ 
+ 		# Udev handles uevents itself, so we don't need to have
+ 		# the kernel call out to any binary in response to them
+ 		echo > /proc/sys/kernel/hotplug
+ 
+-		# Copy static device nodes to /dev
+-		cp -ar /lib/udev/devices/* /dev
++		# LiveCD specific
++		/usr/sbin/dmsetup mknodes
+ 
+ 		# Start the udev daemon to continually watch for, and act on,
+ 		# uevents
+diff -urN lfs-bootscripts-20060415.orig/Makefile lfs-bootscripts-20060415/Makefile
+--- lfs-bootscripts-20060415.orig/Makefile	2006-04-16 01:36:11.000000000 +0600
++++ lfs-bootscripts-20060415/Makefile	2006-04-20 18:19:41.000000000 +0600
+@@ -85,6 +85,41 @@
+ 	install                   -m ${MODE} lfs/sysconfig/network-devices/services/ipv4-static       ${EXTDIR}/sysconfig/network-devices/services/
+ 	install                   -m ${MODE} lfs/sysconfig/network-devices/services/ipv4-static-route ${EXTDIR}/sysconfig/network-devices/services/
+ 
++install-livecd: create-dirs create-service-dir
++	install -m ${CONFMODE} lfs/init.d/functions ${EXTDIR}/rc.d/init.d/
++	install -m ${MODE} lfs/init.d/console       ${EXTDIR}/rc.d/init.d/
++	install -m ${MODE} lfs/init.d/localnet      ${EXTDIR}/rc.d/init.d/
++	install -m ${MODE} lfs/init.d/mountfs       ${EXTDIR}/rc.d/init.d/
++	install -m ${MODE} lfs/init.d/mountkernfs   ${EXTDIR}/rc.d/init.d/
++	install -m ${MODE} lfs/init.d/network       ${EXTDIR}/rc.d/init.d/
++	install -m ${MODE} lfs/init.d/rc            ${EXTDIR}/rc.d/init.d/
++	install -m ${MODE} lfs/init.d/sendsignals   ${EXTDIR}/rc.d/init.d/
++	install -m ${MODE} lfs/init.d/setclock      ${EXTDIR}/rc.d/init.d/
++	install -m ${MODE} lfs/init.d/sysklogd	    ${EXTDIR}/rc.d/init.d/
++	install -m ${MODE} lfs/init.d/udev	    ${EXTDIR}/rc.d/init.d/
++	ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc0.d/S60sendsignals
++	ln -sf ../init.d/localnet    ${EXTDIR}/rc.d/rc0.d/S90localnet
++	ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc6.d/S60sendsignals
++	ln -sf ../init.d/localnet    ${EXTDIR}/rc.d/rc6.d/S90localnet
++	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc0.d/K80network
++	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc1.d/K80network
++	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc2.d/K80network
++	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc3.d/S20network
++	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc4.d/S20network
++	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/mountkernfs ${EXTDIR}/rc.d/rcsysinit.d/S00mountkernfs
++	ln -sf ../init.d/udev        ${EXTDIR}/rc.d/rcsysinit.d/S10udev
++	ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rcsysinit.d/S40mountfs
++	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
++	if [ ! -f ${EXTDIR}/sysconfig/rc          ]; then install -m ${CONFMODE} lfs/sysconfig/rc          ${EXTDIR}/sysconfig/; fi
++	install                   -m ${MODE} lfs/sysconfig/network-devices/ifup   ${EXTDIR}/sysconfig/network-devices/
++	install                   -m ${MODE} lfs/sysconfig/network-devices/ifdown ${EXTDIR}/sysconfig/network-devices/
++	install                   -m ${MODE} lfs/sysconfig/network-devices/services/ipv4-static       ${EXTDIR}/sysconfig/network-devices/services/
++	install                   -m ${MODE} lfs/sysconfig/network-devices/services/ipv4-static-route ${EXTDIR}/sysconfig/network-devices/services/
++
+ install-consolelog: create-dirs
+ 	install -m ${MODE} contrib/init.d/consolelog   ${EXTDIR}/rc.d/init.d
+ 	ln -sf ../init.d/consolelog  ${EXTDIR}/rc.d/rcsysinit.d/S00consolelog

Deleted: branches/udev_update/packages/lfs-bootscripts/mountfs
===================================================================
--- branches/udev_update/packages/lfs-bootscripts/mountfs	2006-04-20 04:41:34 UTC (rev 1485)
+++ branches/udev_update/packages/lfs-bootscripts/mountfs	2006-04-20 12:38:15 UTC (rev 1486)
@@ -1,47 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/mountfs
-#
-# Description : File System Mount Script
-#
-# Authors     : Gerard Beekmans - gerard at linuxfromscratch.org
-#
-# Version     : 00.00
-#
-# Notes       :
-#
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-case "${1}" in
-	start)
-		boot_mesg "Recording existing mounts in /etc/mtab..."
-		> /etc/mtab
-		mount -f / || failed=1
-		mount -f /proc || failed=1
-		mount -f /sys || failed=1
-		(exit ${failed})
-		evaluate_retval
-
-		# This will mount all filesystems that do not have _netdev in
-		# their option list.  _netdev denotes a network filesystem.
-		boot_mesg "Mounting remaining file systems..."
-		mount -a -O no_netdev &>/dev/null
-		evaluate_retval
-		;;
-
-	stop)
-		boot_mesg "Unmounting all other currently mounted file systems..."
-		umount -a -d -r &>/dev/null
-		evaluate_retval
-		;;
-
-	*)
-		echo "Usage: ${0} {start|stop}"
-		exit 1
-		;;
-esac
-
-# End $rc_base/init.d/mountfs

Deleted: branches/udev_update/packages/lfs-bootscripts/udev
===================================================================
--- branches/udev_update/packages/lfs-bootscripts/udev	2006-04-20 04:41:34 UTC (rev 1485)
+++ branches/udev_update/packages/lfs-bootscripts/udev	2006-04-20 12:38:15 UTC (rev 1486)
@@ -1,77 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/udev
-#
-# Description : Udev cold-plugging script
-#
-# Authors     : Zack Winkles
-#
-# Version     : 00.01
-#
-# Notes       :
-#
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-wait_for_uevents() {
-	# until we know how to do better, just wait for _all_ events to finish
-	loop=300
-	confirm=0
-	while true ; do
-		sleep 0.1
-		test -d /dev/.udev/queue && confirm=0 || confirm=$(( $confirm + 1 ))
-		loop=$(( $loop - 1 ))
-		test $loop -gt 0 || break
-		test $confirm -lt 60 || break
-	done
-	>/dev/bug
-	test "$loop" -gt 0
-	evaluate_retval
-	sleep 6
-	if test -s /dev/bug; then
-		mv /dev/bug /dev/bugreport
-		boot_mesg "Please paste the /dev/bugreport file to" ${WARNING}
-		boot_mesg "http://wiki.linuxfromscratch.org/lfs/ticket/1720"
-		boot_mesg "Otherwise, the next version of LFS may be unbootable on your system!"
-		echo_failure
-		sleep 10
-	else
-		rm -f /dev/bug
-	fi 
-}
-
-case "${1}" in
-	start)
-		# LiveCD specific
-		/usr/sbin/dmsetup mknodes
-
-		boot_mesg "Starting udevd..."
-
-		# Udev handles uevents itself, so we don't need to have
-		# the kernel call out to any binary in response to them
-		echo > /proc/sys/kernel/hotplug
-
-		# Start the udev daemon to continually watch for, and act on,
-		# uevents
-		/sbin/udevd --daemon
-		evaluate_retval
-
-		# Now traverse /sys in order to "coldplug" devices that have
-		# already been discovered
-		mkdir -p /dev/.udev/queue
-		/sbin/udevtrigger
-
-		# More uevents may have been triggered during the walk of sysfs,
-		# so wait until they've been processed.
-		wait_for_uevents
-		;;
-
-	*)
-		echo "Usage ${0} {start}"
-		exit 1
-		;;
-esac
-
-# End $rc_base/init.d/udev

Added: branches/udev_update/packages/livecd-bootscripts/Makefile
===================================================================
--- branches/udev_update/packages/livecd-bootscripts/Makefile	                        (rev 0)
+++ branches/udev_update/packages/livecd-bootscripts/Makefile	2006-04-20 12:38:15 UTC (rev 1486)
@@ -0,0 +1,30 @@
+NM= livecd-bootscripts
+VRS= SVN
+
+# Targets
+
+SCRIPTS= customize clkconf langconf
+DATA= font.dat font-errors.dat lang.dat
+
+include $(ROOT)/scripts/functions
+
+chroot:
+	chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(SCRIPTS) $(DATA)
+	@$(call echo_message, Building)
+	@make -f Makefile compile-$@ >>$(NM)-$@.log 2>&1
+	@touch $@
+
+compile-stage2:
+	install -d -m755 /etc/langconf
+	install -m754 $(SCRIPTS) /etc/rc.d/init.d
+	install -m644 $(DATA) /etc/langconf
+	ln -sf ../init.d/customize /etc/rc.d/rcsysinit.d/S09customize
+	ln -sf ../init.d/clkconf /etc/rc.d/rcsysinit.d/S59clkconf
+	ln -sf ../init.d/langconf /etc/rc.d/rcsysinit.d/S69langconf
+
+clean:
+
+.PHONY: clean chroot compile-stage2

Added: branches/udev_update/packages/livecd-bootscripts/clkconf
===================================================================
--- branches/udev_update/packages/livecd-bootscripts/clkconf	                        (rev 0)
+++ branches/udev_update/packages/livecd-bootscripts/clkconf	2006-04-20 12:38:15 UTC (rev 1486)
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# Get a well-defined sorting order
+LC_ALL=C
+export LC_ALL
+
+if [ ! -z "$TZ" ] ; then
+	# Assume that the system clock is already configured,
+	# e.g. from boot prompt
+	exit 0
+fi
+
+DLG_COMMAND="dialog --title \"Configure system clock\" \
+        --default-item \"GMT\" --timeout 20 \
+	--menu \"Select your timezone from the list below\" 0 0 0 \
+	`find /usr/share/zoneinfo/posix -type f | \
+	sed -e 's,/usr/share/zoneinfo/posix/,,' -e 's,$, "",' | sort`"
+TZ_SELECTED=`eval $DLG_COMMAND 3>&2 2>&1 1>&3`
+
+if [ $? -ne 0 ] ; then
+	# The user really doesn't want to configure system clock
+	exit 0
+fi
+
+echo "TZ=$TZ_SELECTED" >>/etc/environment
+echo "TZ=$TZ_SELECTED ; export TZ" >>/etc/sysconfig/rc
+echo "TZ=$TZ_SELECTED ; export TZ" >>/etc/profile
+
+dialog --yes-label "Localtime" --no-label "GMT" \
+	--title 'Configure system clock' \
+	--yesno "Is the system clock set to local time or to GMT?" -1 -1
+
+UTC_SELECTED=$?
+
+case "$UTC_SELECTED" in
+0|1)
+	echo "UTC=$UTC_SELECTED" >/etc/sysconfig/clock
+esac
+
+# Just to avoid useless warnings
+exit 0

Added: branches/udev_update/packages/livecd-bootscripts/customize
===================================================================
--- branches/udev_update/packages/livecd-bootscripts/customize	                        (rev 0)
+++ branches/udev_update/packages/livecd-bootscripts/customize	2006-04-20 12:38:15 UTC (rev 1486)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# this script runs before "console",
+# thus translated error messages are not allowed
+
+LC_ALL=C
+export LC_ALL
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+	start)
+		boot_mesg "Applying CD customizations..."
+		cd /
+		cat /dev/shm/.cdrom/.remove 2>/dev/null | xargs rm -rvf
+		cd /dev/shm/.cdrom
+		find . ! -path ./root.ext2 ! -path ./boot\* ! -path ./.remove | \
+			cpio -pvd / 2>&1 | sed 's,^//\.,,'
+		echo_ok
+		;;
+	*)
+		echo "Usage: ${0} {start}"
+		exit 1
+		;;
+esac

Added: branches/udev_update/packages/livecd-bootscripts/font-errors.dat
===================================================================
--- branches/udev_update/packages/livecd-bootscripts/font-errors.dat	                        (rev 0)
+++ branches/udev_update/packages/livecd-bootscripts/font-errors.dat	2006-04-20 12:38:15 UTC (rev 1486)
@@ -0,0 +1,4 @@
+All non-ASCII characters will be treated as non-printable\nuntil you set locale to something other than "C".
+Some characters are missing from the console font.\nType "startx" to start the X session after login.
+Your language is supported in X window system only.\nType "startx" to start the X session after login.
+Your language is completely unsupported on this CD.\nIt is a bug, but we don't know how to fix it.\nPlease mail instructions to livecd at linuxfromscratch.org

Added: branches/udev_update/packages/livecd-bootscripts/font.dat
===================================================================
--- branches/udev_update/packages/livecd-bootscripts/font.dat	                        (rev 0)
+++ branches/udev_update/packages/livecd-bootscripts/font.dat	2006-04-20 12:38:15 UTC (rev 1486)
@@ -0,0 +1,33 @@
+# Charset	FONT				ERRORCODE (from font-errors.dat)
+ANSI_X3.4-1968	default8x16			1
+BIG5		default8x16			3
+BIG5-HKSCS	default8x16			3
+CP1251		cyr-sun16 -m cp1251		0
+CP1255		LatArCyrHeb-16 -m 8859-8	2
+EUC-JP		default8x16			3
+EUC-KR		default8x16			3
+EUC-TW		default8x16			3
+GB18030		default8x16			3
+GB2312		default8x16			3
+GBK		default8x16			3
+GEORGIAN-PS	default8x16			4
+ISO-8859-1	lat1-16 -m 8859-1		0
+ISO-8859-2	lat2-16 -m 8859-2		0
+ISO-8859-3	LatArCyrHeb-16 -m 8859-3	0
+ISO-8859-5	cyr-sun16 -m 8859-5		0
+ISO-8859-6	LatArCyrHeb-16 -m 8859-6	0
+ISO-8859-7	iso07u-16 -m 8859-7		0
+ISO-8859-8	LatArCyrHeb-16 -m 8859-8	0
+ISO-8859-9	cp857.16 -u cp857 -m 8859-9	0
+ISO-8859-10	LatArCyrHeb-16 -m 8859-10	0
+ISO-8859-13	LatArCyrHeb-16 -m 8859-13	0
+ISO-8859-14	default8x16			3
+ISO-8859-15	lat0-16 -m 8859-15		0
+KOI8-R		cyr-sun16 -m koi8-r		0
+KOI8-T		cyr-sun16 -m koi8-r		2
+KOI8-U		cyr-sun16 -m koi8-u		0
+PT154		cyr-sun16 -m cp1251		2
+# FIXME: "tis-ptsmall.f16 -m tis620" may be more readable
+TIS-620		tis-phaisarn.f16 -m tis620	0
+# This catches all essentially-UTF-8 scripts like Indic ones.
+UTF-8		LatArCyrHeb-16			4

Added: branches/udev_update/packages/livecd-bootscripts/lang.dat
===================================================================
--- branches/udev_update/packages/livecd-bootscripts/lang.dat	                        (rev 0)
+++ branches/udev_update/packages/livecd-bootscripts/lang.dat	2006-04-20 12:38:15 UTC (rev 1486)
@@ -0,0 +1,78 @@
+# DESCRIPTION				LANG		KEYMAP		LEGACY_CHARSET	XKEYMAP
+Default/Other				C		""		""		"us"
+English,_USA_(ISO-8859-1)		en_US		""		""		"us"
+English,_USA_(UTF-8)			en_US.UTF-8	""		"iso-8859-1"	"us"
+English,_GB_(ISO-8859-1)		en_GB		"gb"		""		"uk"
+English,_GB_(UTF-8)			en_GB.UTF-8	"gb"		"iso-8859-1"	"uk"
+English,_Australia_(ISO-8859-1)		en_AU		""		""		"us"
+English,_Australia_(UTF-8)		en_AU.UTF-8	""		"iso-8859-1"	"us"
+
+Belarusian_(CP1251)			be_BY		"by2_win"	""		"us,by(winkeys)"
+Belarusian_(UTF-8)			be_BY.UTF-8	"by"		"iso-8859-5"	"us,by(winkeys)"
+Brazilian,_ABNT2_keymap_(ISO-8859-1)	pt_BR		"br-abnt2"	""		"br-abnt2"
+Brazilian,_ABNT2_keymap_(UTF-8)		pt_BR.UTF-8	"br-abnt2"	"iso-8859-1"	"br-abnt2"
+Bulgarian_(CP1251)			bg_BG		"bg_bds-cp1251"	""		"us,bds_enhanced"
+Bulgarian_(UTF-8)			bg_BG.UTF-8	"bg_bds-utf8"	""		"us,bds_enhanced"
+Chinese_(Traditional,_BIG5)		zh_TW		""		""		"us"
+Chinese_(Traditional,_EUC-TW)		zh_TW.EUC-TW	""		""		"us"
+Chinese_(Traditional,_UTF-8)		zh_TW.UTF-8	""		""		"us"
+Chinese_(Simplified,_GB2312)		zh_CN		""		""		"us"
+Chinese_(Simplified,_GB18030)		zh_CN.GB18030	""		""		"us"
+Chinese_(Simplified,_GBK)		zh_CN.GBK	""		""		"us"
+Chinese_(Simplified,_UTF-8)		zh_CN.UTF-8	""		""		"us"
+Czech_(ISO-8859-2)			cs_CZ		"cz"		""		"cz"
+Czech_(UTF-8)				cs_CZ.UTF-8	"cz"		"iso-8859-2"	"cz"
+Danish_(ISO-8859-1)			da_DK		"dk-latin1"	""		"dk"
+Danish_(UTF-8)				da_DK.UTF-8	"dk-latin1"	"iso-8859-1"	"dk"
+Finnish_(ISO-8859-1)			fi_FI		"fi-latin1"	""		"fi"
+Finnish_(ISO-8859-15)			fi_FI at euro	"fi-latin9"	""		"fi"
+Finnish_(UTF-8)				fi_FI.UTF-8	"fi-latin9"	"iso-8859-15"	"fi"
+French_(ISO-8859-1)			fr_FR		"fr-latin1"	""		"fr"
+French_(ISO-8859-15)			fr_FR at euro	"fr-latin9"	""		"fr"
+French_(UTF-8)				fr_FR.UTF-8	"fr-latin9"	"iso-8859-15"	"fr"
+French_(Canada,_ISO-8859-1)		fr_CA		"cf"		""		"ca_enhanced"
+French_(Canada,_UTF-8)			fr_CA.UTF-8	"cf"		"iso-8859-1"	"ca_enhanced"
+German_(ISO-8859-1)			de_DE		"de-latin1"	""		"de"
+German_(ISO-8859-15)			de_DE at euro	"de-latin1+euro2" ""		"de"
+German_(UTF-8)				de_DE.UTF-8	"de-latin1+euro2" "iso-8859-15"	"de"
+Greek_(ISO-8859-7)			el_GR		"gr"		""		"us,el"
+Greek_(UTF-8)				el_GR.UTF-8	"gr"		"iso-8859-7"	"us,el"
+Hungarian_(ISO-8859-2)			hu_HU		"hu101"		""		"hu"
+Hungarian_(UTF-8)			hu_HU.UTF-8	"hu101"		"iso-8859-2"	"hu"
+Icelandic_(ISO-8859-1)			is_IS		"is-latin1"	""		"is"
+Icelandic_(UTF-8)			is_IS.UTF-8	"is-latin1"	"iso-8859-1"	"is"
+Japanese_(EUC-JP)			ja_JP		""		""		"us"
+Japanese_(UTF-8)			ja_JP.UTF-8	""		""		"us"
+Korean_(EUC-KR)				ko_KR		""		""		"us"
+Korean_(UTF-8)				ko_KR.UTF-8	""		""		"us"
+Norwegian,_Bokmal_(ISO-8859-1)		nb_NO		"no-latin1"	""		"no"
+Norwegian,_Bokmal_(UTF-8)		nb_NO.UTF-8	"no-latin1"	"iso-8859-1"	"no"
+Norwegian,_Nynorsk_(ISO-8859-1)		nn_NO		"no-latin1"	""		"no"
+Norwegian,_Nynorsk_(UTF-8)		nn_NO.UTF-8	"no-latin1"	"iso-8859-1"	"no"
+Polish_(ISO-8859-2)			pl_PL		"pl"		""		"pl2"
+Polish_(UTF-8)				pl_PL.UTF-8	"pl"		"iso-8859-2"	"pl2
+Portuguese_(ISO-8859-1)			pt_PT		"pt-latin1"	""		"pt"
+Portuguese_(ISO-8859-15)		pt_PT at euro	"pt-latin9"	""		"pt"
+Portuguese_(UTF-8)			pt_PT.UTF-8	"pt-latin9"	"iso-8859-15"	"pt"
+Russian_(CP1251)			ru_RU.CP1251	"ru_win"	""		"us,ru(winkeys)"
+Russian_(KOI8-R)			ru_RU.KOI8-R	"ru-ms"		""		"us,ru(winkeys)"
+Russian_(UTF-8)				ru_RU.UTF-8	"ru-ms"		"koi8-r"	"us,ru(winkeys)"
+Slovak,_QWERTZ_keyboard_(ISO-8859-2)	sk_SK		"sk-qwertz"	""		"sk"
+Slovak,_QWERTZ_keyboard_(UTF-8)		sk_SK.UTF-8	"sk-qwertz"	"iso-8859-2"	"sk"
+Slovak,_QWERTY_keyboard_(ISO-8859-2)	sk_SK		"sk-qwerty"	""		"sk_qwerty"
+Slovak,_QWERTY_keyboard_(UTF-8)		sk_SK.UTF-8	"sk-qwerty"	"iso-8859-2"	"sk_qwerty"
+Spanish_(ISO-8859-1)			es_ES		"es"		""		"es"
+Spanish_(ISO-8859-15)			es_ES at euro	"es+euro2"	""		"es"
+Spanish_(UTF-8)				es_ES.UTF-8	"es+euro2"	"iso-8859-15"	"es"
+Spanish,_Mexico_(ISO-8859-1)		es_MX		"la-latin1"	""		"la"
+Spanish,_Mexico_(UTF-8)			es_MX.UTF-8	"la-latin1"	"iso-8859-1"	"la"
+Swedish_(ISO-8859-1)			sv_SE		"sv-latin1"	""		"se"
+Swedish_(UTF-8)				sv_SE.UTF-8	"sv-latin1"	"iso-8859-1"	"se"
+Thai_(TIS-620)				th_TH		"th-win-latin1"	""		"us,th"
+Thai_(UTF-8)				th_TH.UTF-8	"th-win-uni"	""		"us,th"
+Turkish,_F_keyboard_(ISO-8859-9)	tr_TR		"trf"		""		"tr_f"
+Turkish,_F_keyboard_(UTF-8)		tr_TR.UTF-8	"trf"		"iso-8859-9"	"tr_f"
+Turkish,_Q_keyboard_(ISO-8859-9)	tr_TR		"tr_q-latin5"	""		"tr"
+Turkish,_Q_keyboard_(UTF-8)		tr_TR.UTF-8	"tr_q-latin5"	"iso-8859-9"	"tr"
+Ukrainian_(KOI8-U)			uk_UA		"ua-ws"		""		"us,ua(winkeys)"
+Ukrainian_(UTF-8)			uk_UA.UTF-8	"ua-utf-ws"	""		"us,ua(winkeys)"

Added: branches/udev_update/packages/livecd-bootscripts/langconf
===================================================================
--- branches/udev_update/packages/livecd-bootscripts/langconf	                        (rev 0)
+++ branches/udev_update/packages/livecd-bootscripts/langconf	2006-04-20 12:38:15 UTC (rev 1486)
@@ -0,0 +1,191 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/langconf
+#
+# Description : Language and Keymap Configuration Script for the Live CD
+#
+# Authors     : Alexander E. Patrakov
+#
+# Version     : 00.00
+#
+# Notes       :
+#
+########################################################################
+
+SELECTED=
+
+DATABASE=/etc/langconf/lang.dat
+FONTDB=/etc/langconf/font.dat
+ERRDB=/etc/langconf/font-errors.dat
+
+F_ERROR=0
+
+same_locale() {
+	for term in language territory charmap
+	do
+		[ "`LC_ALL=$1 locale $term`" = "`LC_ALL=$2 locale $term`" ] || return 1
+	done
+	return 0
+}
+
+guess_selection() {
+	while read F_DESCRIPTION F_LANG F_KEYMAP F_LEGACYCHARSET F_XKEYMAP
+	do
+		if [ -z "$F_DESCRIPTION" ] || [ "$F_DESCRIPTION" = "#" ]
+		then
+			continue
+		fi
+		F_KEYMAP="${F_KEYMAP//\"/}"
+		F_KEYMAP="${F_KEYMAP//+/ }"
+		F_LEGACYCHARSET="${F_LEGACYCHARSET//\"/}"
+		F_XKEYMAP="${F_XKEYMAP//\"/}"
+		same_locale "$F_LANG" "$LANG" && SELECTED="$F_DESCRIPTION" && return 0
+	done <$DATABASE
+	F_LANG="$LANG"
+	F_KEYMAP=defkeymap
+	F_LEGACYCHARSET=""
+	F_XKEYMAP="us"
+	return 1
+}
+
+get_selection_dlg() {
+	ARGS=""
+	while read F_DESCRIPTION F_JUNK
+	do
+		if [ -z "$F_DESCRIPTION" ] || [ "$F_DESCRIPTION" = "#" ]
+		then
+			continue
+		fi
+		DESCRIPTION=`echo $F_DESCRIPTION | tr _ ' '`
+		ARGS="$ARGS \"$DESCRIPTION\" \"\""
+	done <$DATABASE
+	DLG_COMMAND="dialog --title \"Regional settings\" --timeout 20 \
+	--default-item \"Default/Other\" \
+	--menu \"Choose your locale\" -1 0 0 $ARGS"
+	SELECTED=`eval $DLG_COMMAND 3>&2 2>&1 1>&3`
+
+	if [ $? -ne 0 ] ; then
+		exit 0
+	fi
+}
+
+guess_font() {
+	# Select font that has all characters in the language
+	# Base the selection on the language's non-UTF-8 locale charmap
+	F_CHARMAP=`LC_ALL=${F_LANG%.UTF-8} locale charmap`
+	while IFS="	" read CHARMAP FONT ERROR
+	do
+		if [ "$F_CHARMAP" = "$CHARMAP" ]
+		then
+			F_FONT="$FONT"
+			F_ERROR="$ERROR"
+			if [ "$F_ERROR" != "0" ]
+			then
+				echo -e `sed -n "${F_ERROR}p" $ERRDB`
+				sleep 5
+			fi
+		fi
+	done <$FONTDB
+	
+	# If UTF-8 locale is used, drop any "-m" flag
+	case "$F_LANG" in
+	*.UTF-8)
+		F_FONT=${F_FONT% -m*}
+		;;
+	esac
+}
+
+confirm() {
+	# TODO: simplify life for Dvorak users. They have to edit
+	# this using (awkward) qwerty keymap!
+	
+	DLG_COMMAND="dialog --title \"Confirm/edit settings\" \
+	--no-cancel \
+	--form \"Please review and, if necessary, edit the settings below.
+\n\nKeymap autoconversion is used only together with UTF-8 locales.
+If you don't need to convert your keymap to UTF-8 (e.g. because it
+is already in UTF-8, or because you don't want UTF-8), don't fill in
+that field.
+\n\nIn order to enhance Unicode coverage of the Linux console at the
+cost of unavailable bright colors, use the LatArCyrHeb-16 font.\" 0 0 5 \
+	\"Locale:\" 1 1 \"$F_LANG\" 1 30 40 0 \
+	\"Console keymap:\" 2 1 \"$F_KEYMAP\" 2 30 40 0 \
+	\"  autoconverted from charset:\" 3 1 \"$F_LEGACYCHARSET\" 3 30 40 0 \
+	\"Console font:\" 4 1 \"$F_FONT\" 4 30 40 0 \
+	\"X keymap:\" 5 1 \"$F_XKEYMAP\" 5 30 40 0"
+	SELECTION=`eval $DLG_COMMAND 3>&2 2>&1 1>&3`
+	STATUS=$?
+	[ "$STATUS" != 0 ] && exit 1
+	eval "`echo "$SELECTION" | \
+		sed -e '1s,^,F_LANG=",' \
+		-e '2s,^,F_KEYMAP=",' \
+		-e '3s,^,F_LEGACYCHARSET=",' \
+		-e '4s,^,F_FONT=",' \
+		-e '5s,^,F_XKEYMAP=",' | sed -e 's,$,",'`"
+	return 0
+}
+
+interactive_config() {
+	get_selection_dlg
+	F_SELECTED=`echo $SELECTED | tr ' ' _`
+	LINE=`grep "^$F_SELECTED" $DATABASE | sed 's,[[:space:]]\+,\n,g'`
+	eval "`echo "$LINE" | sed -e 's,+, ,g' -e 's,",,g' | \
+		sed -e '1d' \
+		-e '2s,^,F_LANG=",' \
+		-e '3s,^,F_KEYMAP=",' \
+		-e '4s,^,F_LEGACYCHARSET=",' \
+		-e '5s,^,F_XKEYMAP=",' | sed -e 's,$,",'`"
+	[ -z "$F_KEYMAP" ] && F_KEYMAP=defkeymap
+	guess_font
+	[ -z "$F_XKEYMAP" ] && F_XKEYMAP=us
+	confirm
+}
+
+noninteractive_config() {
+	guess_selection
+	F_LANG="$LANG"
+	guess_font
+	# Accept overrides to our guesses if given on the command line
+	[ -z "$F_KEYMAP" ] && F_KEYMAP=defkeymap
+	[ -z "$F_XKEYMAP" ] && F_XKEYMAP=us
+	[ -n "$KEYMAP" ] && F_KEYMAP=${KEYMAP//+/ }
+	[ -n "$FONT" ] && F_FONT=${FONT//+/ }
+	[ -n "$LEGACY_CHARSET" ] && F_LEGACYCHARSET=$LEGACY_CHARSET
+	[ -n "$XKEYMAP" ] && F_XKEYMAP=$XKEYMAP
+}
+
+# Assume that noninteractive configuration is wanted if LANG is set
+if [ -n "$LANG" ]
+then
+	noninteractive_config
+else
+	interactive_config
+fi
+
+# Write the settings out to configuration files
+echo "LANG=\"$F_LANG\" ; export LANG" >>/etc/profile
+
+echo "KEYMAP=\"$F_KEYMAP\"" >/etc/sysconfig/console
+
+if [ "`LC_ALL="$F_LANG" locale charmap`" = "UTF-8" ]
+then
+	echo "UNICODE=1" >>/etc/sysconfig/console
+	echo "BROKEN_COMPOSE=0" >>/etc/sysconfig/console
+	if [ -n "$F_LEGACYCHARSET" ]
+	then
+		echo "FONT=\"$F_FONT -m ${F_LEGACYCHARSET#iso-}\"" >>/etc/sysconfig/console
+		echo "LEGACY_CHARSET=\"$F_LEGACYCHARSET\"" >>/etc/sysconfig/console
+	else
+		echo "FONT=\"$F_FONT\"" >>/etc/sysconfig/console
+	fi
+else
+	echo "FONT=\"$F_FONT\"" >>/etc/sysconfig/console
+fi
+
+sed -i "s/\"us\"/\"$F_XKEYMAP\"/" /etc/X11/xorg.conf
+
+if [ "$F_ERROR" = "3" ]
+then
+	echo '[ "$TERM" = "linux" ] && LC_ALL=C' >>/etc/profile
+	echo 'export LC_ALL' >>/etc/profile
+fi




More information about the livecd mailing list