summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2010-12-06 19:57:47 +0000
committerJeroen Roovers <jer@gentoo.org>2010-12-06 19:57:47 +0000
commit3ba674e38cffb5e0c5b7b1104af7cb7ef9a3ba9a (patch)
tree6972d4ee15ab485e93675066f3510925fe9eb775 /app-misc/livecd-tools
parentversion bump (diff)
downloadgentoo-2-3ba674e38cffb5e0c5b7b1104af7cb7ef9a3ba9a.tar.gz
gentoo-2-3ba674e38cffb5e0c5b7b1104af7cb7ef9a3ba9a.tar.bz2
gentoo-2-3ba674e38cffb5e0c5b7b1104af7cb7ef9a3ba9a.zip
Do not run getty on ttyB0 by default by gmsoft (bug #347917).
(Portage version: 2.1.9.25/cvs/Linux i686)
Diffstat (limited to 'app-misc/livecd-tools')
-rw-r--r--app-misc/livecd-tools/ChangeLog8
-rw-r--r--app-misc/livecd-tools/files/livecd-tools-1.0.42-ttyB0.patch14
-rw-r--r--app-misc/livecd-tools/livecd-tools-1.0.42.ebuild10
3 files changed, 28 insertions, 4 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/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."