diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2005-02-24 13:56:52 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-02-24 13:56:52 +0000 |
| commit | 6ae76da9235c49d0cf8c2c5cd7b9fb4785ccdde6 (patch) | |
| tree | 4f908541a84aea09cc00be6f3aeab91130ab97df /sys-apps/baselayout | |
| parent | Stable on sparc (diff) | |
| download | gentoo-2-6ae76da9235c49d0cf8c2c5cd7b9fb4785ccdde6.tar.gz gentoo-2-6ae76da9235c49d0cf8c2c5cd7b9fb4785ccdde6.tar.bz2 gentoo-2-6ae76da9235c49d0cf8c2c5cd7b9fb4785ccdde6.zip | |
Updated livecd patch to allow for 19200 baud on serial console and also to export CDBOOT when cdroot=
(Portage version: 2.0.51-r15)
Diffstat (limited to 'sys-apps/baselayout')
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/baselayout/files/rc-scripts-1.4.16-livecd.patch | 37 |
2 files changed, 40 insertions, 4 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 4932bc63f565..3237a00f0edd 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,15 @@ # 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.208 2005/02/06 20:45:07 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.209 2005/02/24 13:56:52 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 + 24 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org> + files/rc-scripts-1.4.16-livecd.patch: + Updated livecd patch to allow for 19200 baud on serial console and also to + export CDBOOT when cdroot= + 06 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> baselayout-1.11.9-r1.ebuild: Changing the 04multilib logic to be "(is more than one api) or (libdir isn't 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 index 97a1b44de137..e001504df03e 100644 --- a/sys-apps/baselayout/files/rc-scripts-1.4.16-livecd.patch +++ b/sys-apps/baselayout/files/rc-scripts-1.4.16-livecd.patch @@ -1,7 +1,38 @@ -diff -burN rc-scripts-1.4.16.orig/sbin/livecd-functions.sh rc-scripts-1.4.16/sbin/livecd-functions.sh +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-02-24 08:43:02.563306408 -0500 +@@ -6,4 +6,6 @@ + + cat /etc/motd 2>/dev/null + cd /root ++source .bashrc ++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 2004-10-21 21:25:10.168689264 -0400 -@@ -178,7 +178,7 @@ ++++ rc-scripts-1.4.16/sbin/livecd-functions.sh 2005-02-24 08:42:02.828387496 -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}"` +@@ -178,7 +185,7 @@ then for x in 1 2 3 4 5 6 do |