Updated livecd patch to allow for 19200 baud on serial console and also to export CDBOOT when cdroot=

Package-Manager: portage-2.0.51-r15

3 files changed, 50 insertions, 14 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/Manifest b/sys-apps/baselayout/Manifest
index f9dab6f18600..68e46efa853b 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,19 +1,19 @@
-MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
-MD5 259544554c6a6d359fa1c440bcbf3c61 ChangeLog 47219
+MD5 75c2ae7f3859b718e0bd759df0af8c32 ChangeLog 47418
 MD5 ba009554d2c5d1aa2cd7a46b9e472b48 baselayout-1.11.8-r3.ebuild 16801
 MD5 db5570c758188667429c14fc67f0f86a baselayout-1.11.9-r1.ebuild 16956
-MD5 245e39f14052cacd4e495fa02ecf2163 baselayout-1.9.4-r6.ebuild 16835
 MD5 e819385f8aa5ac0f1a8ad035a6b9c7f7 baselayout-1.9.4-r7.ebuild 18118
+MD5 245e39f14052cacd4e495fa02ecf2163 baselayout-1.9.4-r6.ebuild 16835
+MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
 MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
-MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
-MD5 adc667ea815b256d6f39259f4134f6df files/sysvinit-2.84-selinux1.patch 3556
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
-MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251
-MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134
-MD5 3d1b5592b9b3398edb36d29422dc0143 files/rc-scripts-1.4.16-livecd.patch 672
-MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134
 MD5 68ea8c716616fbfd5b287dadb5e9ea5c files/digest-baselayout-1.11.8-r3 69
-MD5 844ae054e507637ee440011d729858c8 files/digest-baselayout-1.11.9-r1 69
 MD5 08ade596f939beaf9f7b3657c5811593 files/rc-scripts-1.6.9-checkfs-lvm.patch 579
 MD5 126200ae85bdf0ef43de75411f71aaa8 files/rc-scripts-1.6.9-domainname.patch 380
 MD5 6ec416bfd1097d350c09e78949a736b8 files/rc-scripts-1.6.9-ifconfig.patch 266
+MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134
+MD5 330a94e9bb509eddcaa3f0d7364f353a files/rc-scripts-1.4.16-livecd.patch 1378
+MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251
+MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
+MD5 adc667ea815b256d6f39259f4134f6df files/sysvinit-2.84-selinux1.patch 3556
+MD5 844ae054e507637ee440011d729858c8 files/digest-baselayout-1.11.9-r1 69
+MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134
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