From ccc3c9c78f0787ed4ad823a5fe215e6aecebaf0b Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Fri, 14 Dec 2007 16:28:05 +0000 Subject: [PATCH] fix text bolding on serial console for bug 202266 thanks to Michael Hordijk git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@572 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- ChangeLog | 4 ++++ generic/linuxrc | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6422b09..82cbe81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 14 Dec 2007; Andrew Gaffney generic/linuxrc: + fix text bolding on serial console for bug 202266 thanks to Michael Hordijk + + 13 Dec 2007; Andrew Gaffney gen_determineargs.sh: apply patch from John R. Graham for bug 201482 diff --git a/generic/linuxrc b/generic/linuxrc index bd62a72..c53976d 100644 --- a/generic/linuxrc +++ b/generic/linuxrc @@ -726,7 +726,7 @@ fi if [ "$0" = '/linuxrc' ] || [ "$0" = 'linuxrc' ] then [ ! -e ${CHROOT}/dev/console ] && mknod ${CHROOT}/dev/console c 5 1 - echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting" + echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting${NORMAL}" cd ${CHROOT} mkdir ${CHROOT}/proc ${CHROOT}/sys 2>/dev/null @@ -735,7 +735,7 @@ then then sleep 10 fi - echo -n '.' + echo -ne "${BOLD}.${NORMAL}" if /tmp/.initrd/bin/[ "${USE_DEVFS_NORMAL}" -eq '1' -a "${CDROOT}" -eq '0' ] then @@ -762,13 +762,13 @@ then umount /sys 2>/dev/null umount /tmp/.initrd/sys 2>/dev/null fi - echo -n '.' + echo -ne "${BOLD}.${NORMAL}" # /usr/src/linux/Documentation/initrd.txt: # exec chroot . /sbin/init /dev/console 2>&1 + echo -e "${BOLD}.${NORMAL}" exec dev/console 2>&1 - echo '.' exec chroot . /bin/sh <<- EOF umount /tmp/.initrd || echo "*: Failed to unmount the initrd!" /sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1 @@ -778,14 +778,14 @@ elif [ "$0" = '/init' ] then [ ! -e ${CHROOT}/dev/console ] && mknod ${CHROOT}/dev/console c 5 1 [ ! -e ${CHROOT}/dev/tty1 ] && mknod ${CHROOT}/dev/tty1 c 4 1 - echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting (initramfs)" + echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting (initramfs)${NORMAL}" cd ${CHROOT} mkdir ${CHROOT}/proc ${CHROOT}/sys 2>/dev/null - echo -n '.' + echo -ne "${BOLD}.${NORMAL}" umount /sys || echo '*: Failed to unmount the initrd /sys!' umount /proc || echo '*: Failed to unmount the initrd /proc!' - echo -n '.' + echo -e "${BOLD}.${NORMAL}" exec switch_root -c "/dev/console" "${CHROOT}" ${REAL_INIT:-/sbin/init} ${INIT_OPTS} fi -- 2.26.2