From: Eric Edgar <rocket@gentoo.org>
Date: Wed, 8 Feb 2006 21:48:10 +0000 (+0000)
Subject: add additional console less entry when consoles are chosen for ppc64
X-Git-Tag: CATALYST_2_0_6_916~417
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5ca09dee424f0bbf6ca696bd41eed21ac7a3d592;p=catalyst.git

add additional console less entry when consoles are chosen for ppc64


git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1077 d1e1f19c-881f-0410-ab34-b69fee027534
---

diff --git a/ChangeLog b/ChangeLog
index 4093d789..dfa64d7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.562 2006/02/08 18:59:12 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.563 2006/02/08 21:48:10 rocket Exp $
+
+  08 Feb 2006; Eric Edgar <rocket@gentoo.org>
+  targets/support/bootloader-setup.sh:
+  add additional console less entry when consoles are chosen for ppc64
 
   08 Feb 2006; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py:
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index a4c2d178..239d67c9 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.30 2006/02/02 15:17:03 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.31 2006/02/08 21:48:10 rocket Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
@@ -145,6 +145,23 @@ case ${clst_mainarch} in
 				IBM_YABOOT="true"
 				if [ -n "${clst_kernel_console}" ]
 				then
+					echo >> ${etc_icfg}
+					echo "image=/boot/${x}" >> ${etc_icfg}
+
+					if [ -e "$1/boot/${x}.igz" ]
+					then
+						echo "initrd=/boot/${x}.igz" >> ${etc_icfg}
+					fi
+
+					echo "label=${x}" >> ${etc_icfg}
+					echo "read-write" >> ${icfg}
+					if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ]
+					then
+						echo "append=\"${default_append_line} splash=silent,theme:${clst_livecd_splash_theme}\"" >> ${etc_icfg}
+					else
+						echo "append=\"${default_append_line} splash=silent\"" >> ${etc_icfg}
+					fi
+					
 					for y in ${clst_kernel_console}
 					do
 						echo ${y}
@@ -186,6 +203,23 @@ case ${clst_mainarch} in
 			else
 				if [ -n "${clst_kernel_console}" ]
 				then
+					echo >> ${icfg}
+					echo "image=/boot/${x}" >> ${icfg}
+
+					if [ -e "$1/boot/${x}.igz" ]
+					then
+						echo "initrd=/boot/${x}.igz" >> ${icfg}
+					fi
+
+					echo "label=${x}" >> ${icfg}
+					echo "read-write" >> ${icfg}
+					if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ]
+					then
+						echo "append=\"${default_append_line} splash=silent,theme:${clst_livecd_splash_theme}\"" >> ${icfg}
+					else
+						echo "append=\"${default_append_line} splash=silent\"" >> ${icfg}
+					fi
+					
 					for y in ${clst_kernel_console}
 					do
 						echo >> ${icfg}