Author: alexander Date: 2005-12-06 22:45:17 -0700 (Tue, 06 Dec 2005) New Revision: 1237
Added: trunk/packages/lfs-bootscripts/console.livecd Removed: trunk/packages/lfs-bootscripts/console Modified: trunk/packages/lfs-bootscripts/Makefile Log: Downloaded the console script to /lfs-sources Modified: trunk/packages/lfs-bootscripts/Makefile =================================================================== --- trunk/packages/lfs-bootscripts/Makefile 2005-12-07 05:40:21 UTC (rev 1236) +++ trunk/packages/lfs-bootscripts/Makefile 2005-12-07 05:45:17 UTC (rev 1237) @@ -8,6 +8,10 @@ URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) SHA-$(FILE)= 6de412b717ae09fbaf701ec9485b60f496f173aa +FILE1= console +URL-$(FILE1)= http://www.linuxfromscratch.org/~alexander/patches/$(FILE1) +SHA-$(FILE1)= 2c9c97b6576af6dddedca75cfadf431d5aa53fda + # Targets include $(ROOT)/scripts/functions @@ -16,9 +20,9 @@ chroot "$(MP)" $(chenv-blfs) \ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' -stage2: Makefile $(FILE) +stage2: Makefile $(FILE) $(FILE1) $(std_build) - cp $(SRC)/$(FILE) $(LFSSRC) + cp $(SRC)/{$(FILE),$(FILE1)} $(LFSSRC) compile-stage2: sed -i s/sane/cooked/ lfs/init.d/functions @@ -35,7 +39,7 @@ 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 /etc/rc.d/init.d/ + 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 Deleted: trunk/packages/lfs-bootscripts/console =================================================================== --- trunk/packages/lfs-bootscripts/console 2005-12-07 05:40:21 UTC (rev 1236) +++ trunk/packages/lfs-bootscripts/console 2005-12-07 05:45:17 UTC (rev 1237) @@ -1,104 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin $rc_base/init.d/console -# -# Description : Sets keymap and screen font -# -# Authors : Gerard Beekmans - [EMAIL PROTECTED] -# 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 '[EMAIL PROTECTED](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 Copied: trunk/packages/lfs-bootscripts/console.livecd (from rev 1236, trunk/packages/lfs-bootscripts/console) -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
