diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-04-02 00:24:04 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-04-02 00:24:04 +0000 |
commit | bd31f92e196652838883fdc680bd01243ca48d25 (patch) | |
tree | 328905b0a93a4412164534afc7860a90aa08ddce /sys-apps | |
parent | dont install resize manpage #87596 (diff) | |
download | gentoo-2-bd31f92e196652838883fdc680bd01243ca48d25.tar.gz gentoo-2-bd31f92e196652838883fdc680bd01243ca48d25.tar.bz2 gentoo-2-bd31f92e196652838883fdc680bd01243ca48d25.zip |
remove bogus patch
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/baselayout/ChangeLog | 5 | ||||
-rw-r--r-- | sys-apps/baselayout/files/rc-scripts-1.4.16-livecd-hvc.patch | 38 |
2 files changed, 1 insertions, 42 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 3e63e75f8999..fbc364394305 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,6 +1,6 @@ # ChangeLog for sys-apps/baselayout # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.226 2005/04/01 17:48:14 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.227 2005/04/02 00:24:04 vapier Exp $ # See the gentoo-src rc-scripts ChangeLog for up-to-date release information: # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup @@ -13,9 +13,6 @@ as there is no guarantee that the current ESSID is the one we started with Also, we may not have an ESSID at all... - 31 Mar 2005; Tom Gall <tgall@gentoo.org> +rc-scripts-1.4.16-livecd-hvc.patch - add support for hvc (ppc64 console on partitioned systems) - *baselayout-1.11.10-r5 (30 Mar 2005) 30 Mar 2005; Mike Frysinger <vapier@gentoo.org> diff --git a/sys-apps/baselayout/files/rc-scripts-1.4.16-livecd-hvc.patch b/sys-apps/baselayout/files/rc-scripts-1.4.16-livecd-hvc.patch deleted file mode 100644 index 781a0acf30e2..000000000000 --- a/sys-apps/baselayout/files/rc-scripts-1.4.16-livecd-hvc.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- rc-scripts-1.4.16/sbin/livecd-functions.sh.orig 2005-03-22 20:40:25.912265336 -0600 -+++ rc-scripts-1.4.16/sbin/livecd-functions.sh 2005-03-22 20:43:08.497311240 -0600 -@@ -150,7 +150,7 @@ - sed -i -e '/^c[0-9]/ s/^/#/' /etc/inittab - - # SPARC & HPPA console magic -- if [ "${HOSTTYPE}" = "sparc" -o "${HOSTTYPE}" = "hppa" ] -+ if [ "${HOSTTYPE}" = "sparc" -o "${HOSTTYPE}" = "hppa" -o "${HOSTTYPE}" = "ppc64" ] - then - # Mount openprom tree for user debugging purposes - if [ "${HOSTTYPE}" = "sparc" ] -@@ -179,6 +179,11 @@ - echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab - done - fi -+ if [ -c "/dev/hvc/0" ] -+ then -+ ln -s /dev/hvc/0 /dev/hvc0 -+ echo "c0:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt320" >> /etc/inittab -+ fi - # The rest... - else - if [ "${LIVECD_CONSOLE}" = "tty0" -o "${LIVECD_CONSOLE}" = "" ] -@@ -188,7 +193,13 @@ - echo "c${x}:12345:respawn:/sbin/agetty -nl /bin/bashlogin 38400 tty${x} linux" >> /etc/inittab - done - else -- echo "c1:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab -+ if [ -c "/dev/hvc/0" ] -+ then -+ ln -s /dev/hvc/0 /dev/hvc0 -+ echo "c1:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt320" >> /etc/inittab -+ else -+ echo "c1:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab -+ fi - fi - fi - return 0 |