denes
/
genkernel_fork
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix text bolding on serial console for bug 202266 thanks to Michael Hordijk <hoffbrinkle@hotmail.com>

Browse Source 
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@572 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Andrew Gaffney 17 years ago
parent 5ea7a1432f
commit ccc3c9c78f
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File

4
ChangeLog
Unescape View File

@ -2,6 +2,10 @@
# Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
# $Header: $ # $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: 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 apply patch from John R. Graham <john_r_graham@mindspring.com> for bug 201482

14
generic/linuxrc
Unescape View File

@ -726,7 +726,7 @@ fi
if [ "$0" = '/linuxrc' ] || [ "$0" = 'linuxrc' ] if [ "$0" = '/linuxrc' ] || [ "$0" = 'linuxrc' ]
then then
[ ! -e ${CHROOT}/dev/console ] && mknod ${CHROOT}/dev/console c 5 1 [ ! -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} cd ${CHROOT}
mkdir ${CHROOT}/proc ${CHROOT}/sys 2>/dev/null mkdir ${CHROOT}/proc ${CHROOT}/sys 2>/dev/null
@ -735,7 +735,7 @@ then
then then
sleep 10 sleep 10
fi fi
echo -n '.' echo -ne "${BOLD}.${NORMAL}"
if /tmp/.initrd/bin/[ "${USE_DEVFS_NORMAL}" -eq '1' -a "${CDROOT}" -eq '0' ] if /tmp/.initrd/bin/[ "${USE_DEVFS_NORMAL}" -eq '1' -a "${CDROOT}" -eq '0' ]
then then
@ -762,13 +762,13 @@ then
umount /sys 2>/dev/null umount /sys 2>/dev/null
umount /tmp/.initrd/sys 2>/dev/null umount /tmp/.initrd/sys 2>/dev/null
fi fi
echo -n '.' echo -ne "${BOLD}.${NORMAL}"
# /usr/src/linux/Documentation/initrd.txt: # /usr/src/linux/Documentation/initrd.txt:
# exec chroot . /sbin/init </dev/console >/dev/console 2>&1 # exec chroot . /sbin/init </dev/console >/dev/console 2>&1
echo -e "${BOLD}.${NORMAL}"
exec <dev/console >dev/console 2>&1 exec <dev/console >dev/console 2>&1
echo '.'
exec chroot . /bin/sh <<- EOF exec chroot . /bin/sh <<- EOF
umount /tmp/.initrd || echo "*: Failed to unmount the initrd!" umount /tmp/.initrd || echo "*: Failed to unmount the initrd!"
/sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1 /sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1
@ -778,14 +778,14 @@ elif [ "$0" = '/init' ]
then then
[ ! -e ${CHROOT}/dev/console ] && mknod ${CHROOT}/dev/console c 5 1 [ ! -e ${CHROOT}/dev/console ] && mknod ${CHROOT}/dev/console c 5 1
[ ! -e ${CHROOT}/dev/tty1 ] && mknod ${CHROOT}/dev/tty1 c 4 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} cd ${CHROOT}
mkdir ${CHROOT}/proc ${CHROOT}/sys 2>/dev/null mkdir ${CHROOT}/proc ${CHROOT}/sys 2>/dev/null
echo -n '.' echo -ne "${BOLD}.${NORMAL}"
umount /sys || echo '*: Failed to unmount the initrd /sys!' umount /sys || echo '*: Failed to unmount the initrd /sys!'
umount /proc || echo '*: Failed to unmount the initrd /proc!' 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} exec switch_root -c "/dev/console" "${CHROOT}" ${REAL_INIT:-/sbin/init} ${INIT_OPTS}
fi fi

Write Preview
Loading…
Cancel
Save