fix text bolding on serial console for bug 202266 thanks to Michael Hordijk <hoffbrin...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@572 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index 6422b092baa0928fe965149a9ef229d8965e1cf5..82cbe81651c4eac634e637a6f82e9cd59857f71e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Dec 2007; Andrew Gaffney <agaffney@gentoo.org> generic/linuxrc:
+  fix text bolding on serial console for bug 202266 thanks to Michael Hordijk
+  <hoffbrinkle@hotmail.com>
+
   13 Dec 2007; Andrew Gaffney <agaffney@gentoo.org> gen_determineargs.sh:
   apply patch from John R. Graham <john_r_graham@mindspring.com> for bug 201482
 

diff --git a/generic/linuxrc b/generic/linuxrc
index bd62a720f9cef8f40e11e8c52e0d0efe0edc2298..c53976d87ab5a35647b41d3a6687ce208a49f398 100644 (file)
--- 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 >/dev/console 2>&1
 
+       echo -e "${BOLD}.${NORMAL}"
        exec <dev/console >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