r1766 - in trunk: . etc packages/LFS-BOOK packages/lfs-bootscripts packages/xorg-server root/.mozilla/default/79exklwh.slt

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Wed Dec 6 07:30:11 PST 2006


Author: alexander
Date: 2006-12-06 08:30:07 -0700 (Wed, 06 Dec 2006)
New Revision: 1766

Added:
   trunk/packages/lfs-bootscripts/lfs-bootscripts-20060712-functions-1.patch
   trunk/packages/lfs-bootscripts/lfs-bootscripts-20060712-livecd-1.patch
Removed:
   trunk/packages/lfs-bootscripts/lfs-bootscripts-6.2-functions-1.patch
   trunk/packages/lfs-bootscripts/lfs-bootscripts-6.2-livecd-1.patch
Modified:
   trunk/Makefile
   trunk/etc/profile
   trunk/packages/LFS-BOOK/Makefile
   trunk/packages/lfs-bootscripts/Makefile
   trunk/packages/xorg-server/Makefile
   trunk/root/.mozilla/default/79exklwh.slt/prefs.js
Log:
Updated bootscripts and the book. Adapted xorg to new autotools.


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-12-06 13:52:34 UTC (rev 1765)
+++ trunk/Makefile	2006-12-06 15:30:07 UTC (rev 1766)
@@ -250,7 +250,7 @@
 blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-nano ch-joe \
 	ch-screen ch-pkgconfig ch-libidn ch-libgpg-error ch-libgcrypt \
 	ch-gnutls ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
-	ch-subversion stop-here ch-lfs-bootscripts ch-livecd-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-base ch-Xorg-util ch-Xorg-proto ch-Xorg-lib ch-libdrm ch-Mesa \
@@ -268,7 +268,7 @@
 	ch-dialog ch-ncftp ch-pciutils ch-device-mapper ch-LVM2 ch-dmraid \
 	ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
 	ch-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which ch-BRLTTY \
-	ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm ch-linux \
+	ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm stop-here ch-linux \
 	ch-sysfsutils ch-pcmcia-cs ch-pcmciautils ch-ddccontrol ch-ddccontrol-db \
 	ch-initramfs ch-blfs-bootscripts ch-oui-data \
 	ch-man-fr ch-man-pages-es ch-man-pages-it ch-manpages-de ch-manpages-ru \

Modified: trunk/etc/profile
===================================================================
--- trunk/etc/profile	2006-12-06 13:52:34 UTC (rev 1765)
+++ trunk/etc/profile	2006-12-06 15:30:07 UTC (rev 1766)
@@ -6,7 +6,7 @@
 
 XML_CATALOG_FILES="/usr/share/docbook/xsl-stylesheets-1.69.1/catalog.xml /etc/xml/catalog"
 
-WWW_HOME="/usr/share/LFS-BOOK-6.2-HTML/index.html"
+WWW_HOME="/usr/share/LFS-BOOK-SVN-HTML/index.html"
 
 NNTPSERVER=news.gmane.org
 

Modified: trunk/packages/LFS-BOOK/Makefile
===================================================================
--- trunk/packages/LFS-BOOK/Makefile	2006-12-06 13:52:34 UTC (rev 1765)
+++ trunk/packages/LFS-BOOK/Makefile	2006-12-06 15:30:07 UTC (rev 1766)
@@ -1,20 +1,20 @@
 # LFS Book Makefile
 
 NM= LFS-BOOK
-VRS= 6.2
+VRS= SVN
 DIRBASE= $(NM)-$(VRS)
 DIR= $(DIRBASE)-XML
 HTMLDIR= $(DIRBASE)-HTML
 
-FILE= $(DIR).tar.bz2
-URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/6.2/$(FILE)
-SHA-$(FILE)= 729bcf04d8e4ed0af3c58daf0d289e94d6385052
+#FILE= $(DIR).tar.bz2
+#URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/6.2/$(FILE)
+#SHA-$(FILE)= 729bcf04d8e4ed0af3c58daf0d289e94d6385052
 
-#REV= 7646
-#REVPARM= -r $(REV)
-#
-#URL= svn://svn.linuxfromscratch.org/LFS/trunk/BOOK
+REV= 7882
+REVPARM= -r $(REV)
 
+URL= svn://svn.linuxfromscratch.org/LFS/trunk/BOOK
+
 SEAMONKEY_CONFIG= $(ROOT)/root/.mozilla/default/79exklwh.slt/prefs.js
 
 # Targets
@@ -27,8 +27,8 @@
 
 stage2: Makefile $(FILE)
 	@$(call echo_message, Building)
-	#@svn co -q $(REVPARM) $(URL) $(DIR)-XML
-	tar xf $(FILE)
+	@svn co -q $(REVPARM) $(URL) $(DIR)
+	#tar xf $(FILE)
 	@cd $(DIR) ; make BASEDIR=../$(HTMLDIR)
 	cp -av $(DIR) $(HTMLDIR) /usr/share
 	@sed -i \

Modified: trunk/packages/lfs-bootscripts/Makefile
===================================================================
--- trunk/packages/lfs-bootscripts/Makefile	2006-12-06 13:52:34 UTC (rev 1765)
+++ trunk/packages/lfs-bootscripts/Makefile	2006-12-06 15:30:07 UTC (rev 1766)
@@ -1,12 +1,12 @@
 # LFS-Bootscripts Makefile
 
 NM= lfs-bootscripts
-VRS= 6.2
+VRS= 20060712
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
-URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/6.2/$(FILE)
-SHA-$(FILE)= 616ece5d67a79169e62547141f481ea5150e348c
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= cd3dec92a837f5e6520c91b3d53773bbd37026d0
 
 PATCH1= $(DIR)-livecd-1.patch
 PATCH2= $(DIR)-functions-1.patch

Copied: trunk/packages/lfs-bootscripts/lfs-bootscripts-20060712-functions-1.patch (from rev 1759, trunk/packages/lfs-bootscripts/lfs-bootscripts-6.2-functions-1.patch)
===================================================================
--- trunk/packages/lfs-bootscripts/lfs-bootscripts-20060712-functions-1.patch	                        (rev 0)
+++ trunk/packages/lfs-bootscripts/lfs-bootscripts-20060712-functions-1.patch	2006-12-06 15:30:07 UTC (rev 1766)
@@ -0,0 +1,26 @@
+Origin: http://archives.linuxfromscratch.org/mail-archives/lfs-dev/2006-October/058454.html
+
+--- lfs-bootscripts-6.2/lfs/init.d/functions.orig	2006-03-22 02:02:32.000000000 +0100
++++ lfs-bootscripts-6.2/lfs/init.d/functions	2006-10-31 14:58:51.000000000 +0100
+@@ -363,7 +363,7 @@
+ 		for pid in ${lpids}
+ 		do
+ 			if [ "${pid}" -ne "$$" -a "${pid}" -ne "${PPID}" ]; then
+-				kill -0 "${pid}" > /dev/null &&
++				kill -0 "${pid}" > /dev/null 2>&1 &&
+ 				pidlist="${pidlist} ${pid}"
+ 			fi
+ 			
+@@ -588,7 +588,11 @@
+ 	done
+ 
+ 	if [ -z "${killsig}" ];	then
+-		pidofproc -s "${1}"
++		if [ -z "${pidfile}" ];	then
++			pidofproc -s "${1}"
++		else
++			pidofproc -s -p "${pidfile}" "${1}"
++		fi
+ 
+ 		# Program was terminated
+ 		if [ "$?" != "0" ]; then

Copied: trunk/packages/lfs-bootscripts/lfs-bootscripts-20060712-livecd-1.patch (from rev 1759, trunk/packages/lfs-bootscripts/lfs-bootscripts-6.2-livecd-1.patch)
===================================================================
--- trunk/packages/lfs-bootscripts/lfs-bootscripts-20060712-livecd-1.patch	                        (rev 0)
+++ trunk/packages/lfs-bootscripts/lfs-bootscripts-20060712-livecd-1.patch	2006-12-06 15:30:07 UTC (rev 1766)
@@ -0,0 +1,113 @@
+diff -urN lfs-bootscripts-20060712.orig/lfs/init.d/console lfs-bootscripts-20060712/lfs/init.d/console
+--- lfs-bootscripts-20060712.orig/lfs/init.d/console	2006-07-12 05:19:27.000000000 +0600
++++ lfs-bootscripts-20060712/lfs/init.d/console	2006-07-14 21:44:38.000000000 +0600
+@@ -59,8 +59,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-20060712.orig/lfs/init.d/udev lfs-bootscripts-20060712/lfs/init.d/udev
+--- lfs-bootscripts-20060712.orig/lfs/init.d/udev	2006-06-03 08:23:11.000000000 +0600
++++ lfs-bootscripts-20060712/lfs/init.d/udev	2006-07-14 21:44:38.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 -a /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-20060712.orig/Makefile lfs-bootscripts-20060712/Makefile
+--- lfs-bootscripts-20060712.orig/Makefile	2006-06-03 08:23:11.000000000 +0600
++++ lfs-bootscripts-20060712/Makefile	2006-07-14 21:47:48.000000000 +0600
+@@ -86,6 +86,44 @@
+ 	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/swap          ${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/swap        ${EXTDIR}/rc.d/rc0.d/S80swap
++	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/swap        ${EXTDIR}/rc.d/rc6.d/S80swap
++	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: trunk/packages/lfs-bootscripts/lfs-bootscripts-6.2-functions-1.patch
===================================================================
--- trunk/packages/lfs-bootscripts/lfs-bootscripts-6.2-functions-1.patch	2006-12-06 13:52:34 UTC (rev 1765)
+++ trunk/packages/lfs-bootscripts/lfs-bootscripts-6.2-functions-1.patch	2006-12-06 15:30:07 UTC (rev 1766)
@@ -1,26 +0,0 @@
-Origin: http://archives.linuxfromscratch.org/mail-archives/lfs-dev/2006-October/058454.html
-
---- lfs-bootscripts-6.2/lfs/init.d/functions.orig	2006-03-22 02:02:32.000000000 +0100
-+++ lfs-bootscripts-6.2/lfs/init.d/functions	2006-10-31 14:58:51.000000000 +0100
-@@ -363,7 +363,7 @@
- 		for pid in ${lpids}
- 		do
- 			if [ "${pid}" -ne "$$" -a "${pid}" -ne "${PPID}" ]; then
--				kill -0 "${pid}" > /dev/null &&
-+				kill -0 "${pid}" > /dev/null 2>&1 &&
- 				pidlist="${pidlist} ${pid}"
- 			fi
- 			
-@@ -588,7 +588,11 @@
- 	done
- 
- 	if [ -z "${killsig}" ];	then
--		pidofproc -s "${1}"
-+		if [ -z "${pidfile}" ];	then
-+			pidofproc -s "${1}"
-+		else
-+			pidofproc -s -p "${pidfile}" "${1}"
-+		fi
- 
- 		# Program was terminated
- 		if [ "$?" != "0" ]; then

Deleted: trunk/packages/lfs-bootscripts/lfs-bootscripts-6.2-livecd-1.patch
===================================================================
--- trunk/packages/lfs-bootscripts/lfs-bootscripts-6.2-livecd-1.patch	2006-12-06 13:52:34 UTC (rev 1765)
+++ trunk/packages/lfs-bootscripts/lfs-bootscripts-6.2-livecd-1.patch	2006-12-06 15:30:07 UTC (rev 1766)
@@ -1,113 +0,0 @@
-diff -urN lfs-bootscripts-20060712.orig/lfs/init.d/console lfs-bootscripts-20060712/lfs/init.d/console
---- lfs-bootscripts-20060712.orig/lfs/init.d/console	2006-07-12 05:19:27.000000000 +0600
-+++ lfs-bootscripts-20060712/lfs/init.d/console	2006-07-14 21:44:38.000000000 +0600
-@@ -59,8 +59,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-20060712.orig/lfs/init.d/udev lfs-bootscripts-20060712/lfs/init.d/udev
---- lfs-bootscripts-20060712.orig/lfs/init.d/udev	2006-06-03 08:23:11.000000000 +0600
-+++ lfs-bootscripts-20060712/lfs/init.d/udev	2006-07-14 21:44:38.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 -a /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-20060712.orig/Makefile lfs-bootscripts-20060712/Makefile
---- lfs-bootscripts-20060712.orig/Makefile	2006-06-03 08:23:11.000000000 +0600
-+++ lfs-bootscripts-20060712/Makefile	2006-07-14 21:47:48.000000000 +0600
-@@ -86,6 +86,44 @@
- 	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/swap          ${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/swap        ${EXTDIR}/rc.d/rc0.d/S80swap
-+	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/swap        ${EXTDIR}/rc.d/rc6.d/S80swap
-+	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

Modified: trunk/packages/xorg-server/Makefile
===================================================================
--- trunk/packages/xorg-server/Makefile	2006-12-06 13:52:34 UTC (rev 1765)
+++ trunk/packages/xorg-server/Makefile	2006-12-06 15:30:07 UTC (rev 1766)
@@ -35,7 +35,7 @@
 	sed -i -e 's,#ifdef KDRIVESERVER,#if 1,' dix/dixfonts.c
 	patch -Np1 -i ../$(PATCH1)
 	patch -Np1 -i ../$(PATCH2)
-	automake
+	autoreconf --force --install --verbose
 	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 	    --with-mesa-source=`pwd`/$(DIR1) --with-default-font-path=built-ins
 	make

Modified: trunk/root/.mozilla/default/79exklwh.slt/prefs.js
===================================================================
--- trunk/root/.mozilla/default/79exklwh.slt/prefs.js	2006-12-06 13:52:34 UTC (rev 1765)
+++ trunk/root/.mozilla/default/79exklwh.slt/prefs.js	2006-12-06 15:30:07 UTC (rev 1766)
@@ -11,7 +11,7 @@
 
 user_pref("browser.preferences.lastpanel", 0);
 user_pref("browser.search.defaultengine", "engine:///usr/lib/seamonkey-1.0.5/searchplugins/google.src");
-user_pref("browser.startup.homepage", "file:///usr/share/LFS-BOOK-6.2-HTML/index.html");
+user_pref("browser.startup.homepage", "file:///usr/share/LFS-BOOK-SVN-HTML/index.html");
 user_pref("browser.startup.homepage_override.mstone", "rv:1.8.0.7");
 user_pref("dom.disable_open_during_load", true);
 user_pref("extensions.disabledObsolete", true);




More information about the livecd mailing list