diff options
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/baselayout/ChangeLog | 11 | ||||
-rw-r--r-- | sys-apps/baselayout/baselayout-1.11.10-r3.ebuild | 8 | ||||
-rw-r--r-- | sys-apps/baselayout/baselayout-1.11.10-r4.ebuild | 8 | ||||
-rw-r--r-- | sys-apps/baselayout/baselayout-1.11.10-r5.ebuild | 8 | ||||
-rw-r--r-- | sys-apps/baselayout/baselayout-1.11.10-r6.ebuild | 8 | ||||
-rw-r--r-- | sys-apps/baselayout/baselayout-1.11.10-r7.ebuild | 8 | ||||
-rw-r--r-- | sys-apps/baselayout/baselayout-1.11.9-r1.ebuild | 8 | ||||
-rw-r--r-- | sys-apps/baselayout/baselayout-1.12.0_alpha1-r4.ebuild | 8 | ||||
-rw-r--r-- | sys-apps/baselayout/baselayout-1.9.4-r6.ebuild | 9 | ||||
-rw-r--r-- | sys-apps/baselayout/baselayout-1.9.4-r7.ebuild | 9 | ||||
-rw-r--r-- | sys-apps/baselayout/files/rc-scripts-1.4.16-livecd.patch | 73 |
11 files changed, 28 insertions, 130 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 7b4c81429fd0..0d5a6ee1e51c 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,19 @@ # ChangeLog for sys-apps/baselayout # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.229 2005/04/11 21:55:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.230 2005/04/15 16:13:25 wolf31o2 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 + 15 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org> + -files/rc-scripts-1.4.16-livecd.patch, baselayout-1.9.4-r6.ebuild, + baselayout-1.9.4-r7.ebuild, baselayout-1.11.9-r1.ebuild, + baselayout-1.11.10-r3.ebuild, baselayout-1.11.10-r4.ebuild, + baselayout-1.11.10-r5.ebuild, baselayout-1.11.10-r6.ebuild, + baselayout-1.11.10-r7.ebuild, baselayout-1.12.0_alpha1-r4.ebuild: + Removing livecd-specific patches and all livecd-specific options as these + have all been moved to livecd-tools. + *baselayout-1.11.10-r7 (11 Apr 2005) 11 Apr 2005; Mike Frysinger <vapier@gentoo.org> diff --git a/sys-apps/baselayout/baselayout-1.11.10-r3.ebuild b/sys-apps/baselayout/baselayout-1.11.10-r3.ebuild index 6a889495aaba..10082a262095 100644 --- a/sys-apps/baselayout/baselayout-1.11.10-r3.ebuild +++ b/sys-apps/baselayout/baselayout-1.11.10-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.10-r3.ebuild,v 1.1 2005/03/23 14:50:22 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.10-r3.ebuild,v 1.2 2005/04/15 16:13:25 wolf31o2 Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2 LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="bootstrap build livecd static uclibc" +IUSE="bootstrap build static uclibc" # This version of baselayout needs gawk in /bin, but as we do not have # a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" @@ -297,9 +297,6 @@ src_install() { # cd ${S}/bin dobin rc-status - if use livecd; then - dobin bashlogin - fi # # Setup files in /sbin @@ -316,7 +313,6 @@ src_install() { # These moved from /etc/init.d/ to /sbin to help newb systems # from breaking dosbin runscript.sh functions.sh - use livecd && dosbin livecd-functions.sh # Compat symlinks between /etc/init.d and /sbin # (some stuff have hardcoded paths) diff --git a/sys-apps/baselayout/baselayout-1.11.10-r4.ebuild b/sys-apps/baselayout/baselayout-1.11.10-r4.ebuild index a118a733c0d6..f7b208b7977e 100644 --- a/sys-apps/baselayout/baselayout-1.11.10-r4.ebuild +++ b/sys-apps/baselayout/baselayout-1.11.10-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.10-r4.ebuild,v 1.1 2005/03/23 17:46:09 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.10-r4.ebuild,v 1.2 2005/04/15 16:13:25 wolf31o2 Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2 LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="bootstrap build livecd static uclibc" +IUSE="bootstrap build static uclibc" # This version of baselayout needs gawk in /bin, but as we do not have # a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" @@ -297,9 +297,6 @@ src_install() { # cd ${S}/bin dobin rc-status - if use livecd; then - dobin bashlogin - fi # # Setup files in /sbin @@ -316,7 +313,6 @@ src_install() { # These moved from /etc/init.d/ to /sbin to help newb systems # from breaking dosbin runscript.sh functions.sh - use livecd && dosbin livecd-functions.sh # Compat symlinks between /etc/init.d and /sbin # (some stuff have hardcoded paths) diff --git a/sys-apps/baselayout/baselayout-1.11.10-r5.ebuild b/sys-apps/baselayout/baselayout-1.11.10-r5.ebuild index 0bdc8338818f..edc2fa9659ff 100644 --- a/sys-apps/baselayout/baselayout-1.11.10-r5.ebuild +++ b/sys-apps/baselayout/baselayout-1.11.10-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.10-r5.ebuild,v 1.1 2005/03/30 05:45:37 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.10-r5.ebuild,v 1.2 2005/04/15 16:13:25 wolf31o2 Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2 LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="bootstrap build livecd static uclibc" +IUSE="bootstrap build static uclibc" # This version of baselayout needs gawk in /bin, but as we do not have # a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" @@ -300,9 +300,6 @@ src_install() { # cd ${S}/bin dobin rc-status - if use livecd; then - dobin bashlogin - fi # # Setup files in /sbin @@ -319,7 +316,6 @@ src_install() { # These moved from /etc/init.d/ to /sbin to help newb systems # from breaking dosbin runscript.sh functions.sh - use livecd && dosbin livecd-functions.sh # Compat symlinks between /etc/init.d and /sbin # (some stuff have hardcoded paths) diff --git a/sys-apps/baselayout/baselayout-1.11.10-r6.ebuild b/sys-apps/baselayout/baselayout-1.11.10-r6.ebuild index 02a73b1333b3..7861d5adafb4 100644 --- a/sys-apps/baselayout/baselayout-1.11.10-r6.ebuild +++ b/sys-apps/baselayout/baselayout-1.11.10-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.10-r6.ebuild,v 1.2 2005/04/02 01:06:37 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.10-r6.ebuild,v 1.3 2005/04/15 16:13:25 wolf31o2 Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2 LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="bootstrap build livecd static uclibc" +IUSE="bootstrap build static uclibc" # This version of baselayout needs gawk in /bin, but as we do not have # a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" @@ -305,9 +305,6 @@ src_install() { # cd ${S}/bin dobin rc-status - if use livecd; then - dobin bashlogin - fi # # Setup files in /sbin @@ -324,7 +321,6 @@ src_install() { # These moved from /etc/init.d/ to /sbin to help newb systems # from breaking dosbin runscript.sh functions.sh - use livecd && dosbin livecd-functions.sh # Compat symlinks between /etc/init.d and /sbin # (some stuff have hardcoded paths) diff --git a/sys-apps/baselayout/baselayout-1.11.10-r7.ebuild b/sys-apps/baselayout/baselayout-1.11.10-r7.ebuild index 87ee5799f687..35089f82adfa 100644 --- a/sys-apps/baselayout/baselayout-1.11.10-r7.ebuild +++ b/sys-apps/baselayout/baselayout-1.11.10-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.10-r7.ebuild,v 1.1 2005/04/11 21:55:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.10-r7.ebuild,v 1.2 2005/04/15 16:13:25 wolf31o2 Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2 LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="bootstrap build livecd static uclibc" +IUSE="bootstrap build static uclibc" # This version of baselayout needs gawk in /bin, but as we do not have # a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" @@ -308,9 +308,6 @@ src_install() { # cd ${S}/bin dobin rc-status - if use livecd; then - dobin bashlogin - fi # # Setup files in /sbin @@ -327,7 +324,6 @@ src_install() { # These moved from /etc/init.d/ to /sbin to help newb systems # from breaking dosbin runscript.sh functions.sh - use livecd && dosbin livecd-functions.sh # Compat symlinks between /etc/init.d and /sbin # (some stuff have hardcoded paths) diff --git a/sys-apps/baselayout/baselayout-1.11.9-r1.ebuild b/sys-apps/baselayout/baselayout-1.11.9-r1.ebuild index 482a4029e374..156c37d1ecdc 100644 --- a/sys-apps/baselayout/baselayout-1.11.9-r1.ebuild +++ b/sys-apps/baselayout/baselayout-1.11.9-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.9-r1.ebuild,v 1.7 2005/03/10 23:45:56 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.9-r1.ebuild,v 1.8 2005/04/15 16:13:25 wolf31o2 Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2 LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="bootstrap build livecd static uclibc" +IUSE="bootstrap build static uclibc" # This version of baselayout needs gawk in /bin, but as we do not have # a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" @@ -289,9 +289,6 @@ src_install() { # cd ${S}/bin dobin rc-status - if use livecd; then - dobin bashlogin - fi # # Setup files in /sbin @@ -308,7 +305,6 @@ src_install() { # These moved from /etc/init.d/ to /sbin to help newb systems # from breaking dosbin runscript.sh functions.sh - use livecd && dosbin livecd-functions.sh # Compat symlinks between /etc/init.d and /sbin # (some stuff have hardcoded paths) diff --git a/sys-apps/baselayout/baselayout-1.12.0_alpha1-r4.ebuild b/sys-apps/baselayout/baselayout-1.12.0_alpha1-r4.ebuild index 1921d6462027..be3ab9c53962 100644 --- a/sys-apps/baselayout/baselayout-1.12.0_alpha1-r4.ebuild +++ b/sys-apps/baselayout/baselayout-1.12.0_alpha1-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_alpha1-r4.ebuild,v 1.1 2005/03/23 17:46:09 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_alpha1-r4.ebuild,v 1.2 2005/04/15 16:13:25 wolf31o2 Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2 LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="bootstrap build livecd static uclibc" +IUSE="bootstrap build static uclibc" # This version of baselayout needs gawk in /bin, but as we do not have # a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" @@ -300,9 +300,6 @@ src_install() { # cd ${S}/bin dobin rc-status - if use livecd; then - dobin bashlogin - fi # # Setup files in /sbin @@ -319,7 +316,6 @@ src_install() { # These moved from /etc/init.d/ to /sbin to help newb systems # from breaking dosbin runscript.sh functions.sh - use livecd && dosbin livecd-functions.sh # Compat symlinks between /etc/init.d and /sbin # (some stuff have hardcoded paths) diff --git a/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild b/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild index de3947197451..873dba6bd6f5 100644 --- a/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild +++ b/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild,v 1.10 2005/04/12 21:10:33 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.9.4-r6.ebuild,v 1.11 2005/04/15 16:13:25 wolf31o2 Exp $ inherit flag-o-matic eutils toolchain-funcs @@ -19,7 +19,7 @@ SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-${SVIV}.tar.g LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86 ppc sparc mips alpha arm hppa ia64 ppc64 s390 sh" -IUSE="bootstrap build livecd static selinux uclibc ibm" +IUSE="bootstrap build static selinux uclibc ibm" # This version of baselayout needs gawk in /bin, but as we do not have # a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" @@ -45,7 +45,6 @@ src_unpack() { # available (not soon enough for 2004.3) cd ${S} epatch ${FILESDIR}/rc-scripts-1.4.16-splash.patch - epatch ${FILESDIR}/rc-scripts-1.4.16-livecd.patch # # Baselayout setup @@ -356,9 +355,6 @@ src_install() { # cd ${S}/bin dobin rc-status - if use livecd; then - dobin bashlogin - fi # # Setup files in /sbin @@ -375,7 +371,6 @@ src_install() { # These moved from /etc/init.d/ to /sbin to help newb systems # from breaking dosbin runscript.sh functions.sh - use livecd && dosbin livecd-functions.sh # Compat symlinks between /etc/init.d and /sbin # (some stuff have hardcoded paths) diff --git a/sys-apps/baselayout/baselayout-1.9.4-r7.ebuild b/sys-apps/baselayout/baselayout-1.9.4-r7.ebuild index ba75d645e2f5..8408f4b614da 100644 --- a/sys-apps/baselayout/baselayout-1.9.4-r7.ebuild +++ b/sys-apps/baselayout/baselayout-1.9.4-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.9.4-r7.ebuild,v 1.4 2005/03/01 22:01:23 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.9.4-r7.ebuild,v 1.5 2005/04/15 16:13:25 wolf31o2 Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -19,7 +19,7 @@ SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-${SVIV}.tar.g LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64" -IUSE="bootstrap build livecd static selinux uclibc" +IUSE="bootstrap build static selinux uclibc" # This version of baselayout needs gawk in /bin, but as we do not have # a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" @@ -45,7 +45,6 @@ src_unpack() { # available (not soon enough for 2004.3) cd ${S} epatch ${FILESDIR}/rc-scripts-1.4.16-splash.patch - epatch ${FILESDIR}/rc-scripts-1.4.16-livecd.patch # # Baselayout setup @@ -376,9 +375,6 @@ src_install() { # cd ${S}/bin dobin rc-status - if use livecd; then - dobin bashlogin - fi # # Setup files in /sbin @@ -395,7 +391,6 @@ src_install() { # These moved from /etc/init.d/ to /sbin to help newb systems # from breaking dosbin runscript.sh functions.sh - use livecd && dosbin livecd-functions.sh # Compat symlinks between /etc/init.d and /sbin # (some stuff have hardcoded paths) diff --git a/sys-apps/baselayout/files/rc-scripts-1.4.16-livecd.patch b/sys-apps/baselayout/files/rc-scripts-1.4.16-livecd.patch deleted file mode 100644 index 36ffb6f1688d..000000000000 --- a/sys-apps/baselayout/files/rc-scripts-1.4.16-livecd.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -urN rc-scripts-1.4.16.orig/bin/bashlogin rc-scripts-1.4.16/bin/bashlogin ---- rc-scripts-1.4.16.orig/bin/bashlogin 2004-05-15 22:16:32.000000000 -0400 -+++ rc-scripts-1.4.16/bin/bashlogin 2005-03-23 10:00:23.000000000 -0500 -@@ -6,4 +6,6 @@ - - cat /etc/motd 2>/dev/null - cd /root -+[ -e .bashrc ] && source .bashrc -+[ -e .bash_profile ] && source .bash_profile - exec -l /bin/bash -diff -urN rc-scripts-1.4.16.orig/sbin/livecd-functions.sh rc-scripts-1.4.16/sbin/livecd-functions.sh ---- rc-scripts-1.4.16.orig/sbin/livecd-functions.sh 2004-05-21 11:22:12.000000000 -0400 -+++ rc-scripts-1.4.16/sbin/livecd-functions.sh 2005-03-23 10:01:20.000000000 -0500 -@@ -42,6 +42,9 @@ - 14400*) - LIVECD_CONSOLE_BAUD=14400 - ;; -+ 19200*) -+ LIVECD_CONSOLE_BAUD=19200 -+ ;; - 28800*) - LIVECD_CONSOLE_BAUD=28800 - ;; -@@ -108,6 +111,10 @@ - CDBOOT="yes" - export CDBOOT - ;; -+ cdroot\=*) -+ CDBOOT="yes" -+ export CDBOOT -+ ;; - console\=*) - local live_console - live_console=`livecd_parse_opt "${x}"` -@@ -143,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" ] -@@ -172,16 +179,27 @@ - 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 vt220" >> /etc/inittab -+ fi - # The rest... - else - if [ "${LIVECD_CONSOLE}" = "tty0" -o "${LIVECD_CONSOLE}" = "" ] - then - for x in 1 2 3 4 5 6 - do -- echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab -+ 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 vt220" >> /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 |