Do not run getty on ttyB0 by default by gmsoft (bug #347917).

Package-Manager: portage-2.1.9.25/cvs/Linux i686

4 files changed, 31 insertions, 6 deletions

diff --git a/app-misc/livecd-tools/ChangeLog b/app-misc/livecd-tools/ChangeLog
index 813a79591efa..4046e23a35ce 100644
--- a/app-misc/livecd-tools/ChangeLog
+++ b/app-misc/livecd-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/livecd-tools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/ChangeLog,v 1.110 2009/06/29 16:51:24 agaffney Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/ChangeLog,v 1.111 2010/12/06 19:57:47 jer Exp $
+
+  06 Dec 2010; Jeroen Roovers <jer@gentoo.org> livecd-tools-1.0.42.ebuild,
+  +files/livecd-tools-1.0.42-ttyB0.patch:
+  Do not run getty on ttyB0 by default by gmsoft (bug #347917).
 
 *livecd-tools-1.0.42 (29 Jun 2009)
 
diff --git a/app-misc/livecd-tools/Manifest b/app-misc/livecd-tools/Manifest
index c8f5a67b777f..9334c36f724d 100644
--- a/app-misc/livecd-tools/Manifest
+++ b/app-misc/livecd-tools/Manifest
@@ -1,6 +1,7 @@
+AUX livecd-tools-1.0.42-ttyB0.patch 517 RMD160 d232c983a4e45bb087ad12deefac08ef0872be36 SHA1 1d06c3287a531e04ef86d7b3f8017f584faac576 SHA256 1695f793ad33aa72de46a8cd392f8ded4cd60da82576e38e6322a66b8b064752
 DIST livecd-tools-1.0.40.tar.bz2 10610 RMD160 8db6b15d5df1dba92b4fad70b2b6bcc3a6153287 SHA1 d9bb532ec8cd092288489949252e1310118a4b6e SHA256 03f0a6d943f6dbaade14ce16c325777498ce9ca9c8b9480147117816a9857541
 DIST livecd-tools-1.0.42.tar.bz2 11166 RMD160 69c475cbeeb2a43b1ce758386ba9b4c5eb0d520a SHA1 f3f7005a7d4f5fd573bdb4b4dca7850abf5f77c9 SHA256 e480b1a5c435f176227711b06a0f1ab8388b8ea4950174880e3c73473c998f87
 EBUILD livecd-tools-1.0.40.ebuild 1564 RMD160 934f28f7c1a18afe7d2996a2edc87d617f941853 SHA1 6f29be4c4f4fcc171854746794e857d85e1552d8 SHA256 0bbbca6d5028e520f34534d56d01be37c23f09a3f587e731bbc6822ca636011c
-EBUILD livecd-tools-1.0.42.ebuild 1566 RMD160 cbe98a2dbea194f848238d1aa6d80e6539f22dfa SHA1 bc3362ef23f5b87aabe92f0afeb63f4465acb156 SHA256 2e77fccc066b7b05a71c642c83a20c5d5dc6b79e6b84978f1e6ab7d603f415e9
-MISC ChangeLog 21399 RMD160 db3b16f0632eeb0fba4e7474cbc30d443058cd9f SHA1 79fd72fba27b582ff07bfb8d5bbe1081e6a4bb26 SHA256 91dad098b785cdb5b5390ecacfb76fd438c1de03fb4201c2a6c08d33e3d659d9
+EBUILD livecd-tools-1.0.42.ebuild 1642 RMD160 37231180e93318980b5ad87c5edf83e722b3c22c SHA1 869664b84fdb965bc535998663add94888b0fd11 SHA256 0bdff51600574df5d2d62231df257286d65ee17d789eb62060ddad4905fa1122
+MISC ChangeLog 21576 RMD160 1dc4ffcecc12378aa04a32b3159a7db44d6f87ea SHA1 a6900570a3443f7386928c003e10e7f3ba8fa6ce SHA256 0716d49cd34d02df59e301acbce8942993d7675609947818eb464d1dd36aeb16
 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
diff --git a/app-misc/livecd-tools/files/livecd-tools-1.0.42-ttyB0.patch b/app-misc/livecd-tools/files/livecd-tools-1.0.42-ttyB0.patch
new file mode 100644
index 000000000000..1e9904d5b8a8
--- /dev/null
+++ b/app-misc/livecd-tools/files/livecd-tools-1.0.42-ttyB0.patch
@@ -0,0 +1,14 @@
+# Comment out the ttyB0 line in inittab, by gmsoft
+
+diff --git a/livecd-functions.sh b/livecd-functions.sh
+index d51dd9e..cfc1a57 100755
+--- a/livecd-functions.sh
++++ b/livecd-functions.sh
+@@ -551,6 +551,7 @@ livecd_fix_inittab() {
+ 	# Comment out current getty settings
+ 	sed -i -e '/^c[0-9]/ s/^/#/' /etc/inittab
+ 	sed -i -e '/^s[01]/ s/^/#/' /etc/inittab
++	sed -i -e '/^b0/ s/^/#/' /etc/inittab
+ 
+ 	# SPARC & HPPA console magic
+ 	if [ "${HOSTTYPE}" = "sparc" -o "${HOSTTYPE}" = "hppa" -o "${HOSTTYPE}" = "ppc64" ]
diff --git a/app-misc/livecd-tools/livecd-tools-1.0.42.ebuild b/app-misc/livecd-tools/livecd-tools-1.0.42.ebuild
index 5c2f1ced2936..78407e806703 100644
--- a/app-misc/livecd-tools/livecd-tools-1.0.42.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-1.0.42.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/livecd-tools-1.0.42.ebuild,v 1.1 2009/06/29 16:51:24 agaffney Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/livecd-tools/livecd-tools-1.0.42.ebuild,v 1.2 2010/12/06 19:57:47 jer Exp $
 
 inherit eutils
 
@@ -32,6 +32,12 @@ RDEPEND="dev-util/dialog
 	ppc? ( opengl? ( ${OPENGL_DEPEND} )
 		X? ( >=x11-misc/mkxf86config-0.9.7 ) )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-ttyB0.patch
+}
+
 pkg_setup() {
 		ewarn "This package is designed for use on the LiveCD only and will do"
 		ewarn "unspeakably horrible and unexpected things on a normal system."