Author: alexander Date: 2007-04-22 06:12:43 -0600 (Sun, 22 Apr 2007) New Revision: 1851
Added: trunk/packages/lfs-bootscripts/lfs-bootscripts-20070420-livecd-1.patch Removed: trunk/packages/lfs-bootscripts/lfs-bootscripts-20070203-functions-1.patch trunk/packages/lfs-bootscripts/lfs-bootscripts-20070203-livecd-1.patch Modified: trunk/packages/LFS-BOOK/Makefile trunk/packages/lfs-bootscripts/Makefile Log: Updated the book and the bootscripts Modified: trunk/packages/LFS-BOOK/Makefile =================================================================== --- trunk/packages/LFS-BOOK/Makefile 2007-04-22 11:13:49 UTC (rev 1850) +++ trunk/packages/LFS-BOOK/Makefile 2007-04-22 12:12:43 UTC (rev 1851) @@ -10,7 +10,7 @@ #URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/6.2/$(FILE) #SHA-$(FILE)= 729bcf04d8e4ed0af3c58daf0d289e94d6385052 -REV= 8080 +REV= 8096 REVPARM= -r $(REV) URL= svn://svn.linuxfromscratch.org/LFS/trunk/BOOK Modified: trunk/packages/lfs-bootscripts/Makefile =================================================================== --- trunk/packages/lfs-bootscripts/Makefile 2007-04-22 11:13:49 UTC (rev 1850) +++ trunk/packages/lfs-bootscripts/Makefile 2007-04-22 12:12:43 UTC (rev 1851) @@ -1,15 +1,14 @@ # LFS-Bootscripts Makefile NM= lfs-bootscripts -VRS= 20070203 +VRS= 20070420 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/development/$(FILE) -SHA-$(FILE)= 9bba196f39f0d86980086f469912865c1585acf8 +SHA-$(FILE)= 59c9c4443c85b1e6dd903036c24845944775c36b PATCH1= $(DIR)-livecd-1.patch -PATCH2= $(DIR)-functions-1.patch # Targets @@ -24,7 +23,6 @@ compile-stage2: patch -Np1 -i ../$(PATCH1) - patch -Np1 -i ../$(PATCH2) make install-livecd clean: Deleted: trunk/packages/lfs-bootscripts/lfs-bootscripts-20070203-functions-1.patch =================================================================== --- trunk/packages/lfs-bootscripts/lfs-bootscripts-20070203-functions-1.patch 2007-04-22 11:13:49 UTC (rev 1850) +++ trunk/packages/lfs-bootscripts/lfs-bootscripts-20070203-functions-1.patch 2007-04-22 12:12:43 UTC (rev 1851) @@ -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-20070203-livecd-1.patch =================================================================== --- trunk/packages/lfs-bootscripts/lfs-bootscripts-20070203-livecd-1.patch 2007-04-22 11:13:49 UTC (rev 1850) +++ trunk/packages/lfs-bootscripts/lfs-bootscripts-20070203-livecd-1.patch 2007-04-22 12:12:43 UTC (rev 1851) @@ -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 Copied: trunk/packages/lfs-bootscripts/lfs-bootscripts-20070420-livecd-1.patch (from rev 1849, trunk/packages/lfs-bootscripts/lfs-bootscripts-20070203-livecd-1.patch) =================================================================== --- trunk/packages/lfs-bootscripts/lfs-bootscripts-20070420-livecd-1.patch (rev 0) +++ trunk/packages/lfs-bootscripts/lfs-bootscripts-20070420-livecd-1.patch 2007-04-22 12:12:43 UTC (rev 1851) @@ -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 -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
