Changed sed line for 1024x768-only splash for x86 and amd64 only, as we control the...

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

diff --git a/ChangeLog b/ChangeLog
index f0625b06ce6c37d139a8970c20756d827dc88748..df49d69bbe89ad160a7ee17b7246e08d3a66672e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.282 2005/06/28 22:47:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.283 2005/06/30 16:07:46 wolf31o2 Exp $
+
+  30 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/bootloader-setup.sh, targets/support/pre-kmerge.sh:
+  Changed sed line for 1024x768-only splash for x86 and amd64 only, as we
+  control the framebuffer size there. Also, added CONSOLE=/dev/tty1 quiet to
+  splash command line.
 
   28 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/create-iso.sh:

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index c7886383c66ee82584fbab7e28cd6437d2b02277..be3632486e897ec6d86b6402a2cb9eada53c186c 100755 (executable)
--- 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.7 2005/06/28 17:32:35 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.8 2005/06/30 16:07:46 wolf31o2 Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
@@ -124,7 +124,7 @@ case ${clst_mainarch} in
                                echo "  kernel ${x}" >> ${icfg}
                                if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ]
                                then
-                                       echo "  append ${default_append_line} vga=791 splash=silent,theme:${clst_livecd_splash_theme} ${keymap}" >> ${icfg}
+                                       echo "  append ${default_append_line} vga=791 splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet ${keymap}" >> ${icfg}
                                else
                                        echo "  append ${default_append_line} vga=791 splash=silent ${keymap}" >> ${icfg}
                                fi

diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
index dcf9c8bad543ed33e9db97ff3140c4ac43e67c3b..a11bae002cee8553b1c8f69c2ac7f79913cdac8f 100755 (executable)
--- a/targets/support/pre-kmerge.sh
+++ b/targets/support/pre-kmerge.sh
@@ -14,7 +14,11 @@ install -d /usr/portage/packages/gk_binaries
 # Setup case structure for livecd_type
 case ${clst_livecd_type} in
        gentoo-release-minimal | gentoo-release-universal)
-               sed -i 's/initramfs_data.cpio.gz /initramfs_data.cpio.gz -r 1024x768 /' /usr/share/genkernel/genkernel
+               case ${clst_mainarch} in
+                       amd64|x86)
+                               sed -i 's/initramfs_data.cpio.gz /initramfs_data.cpio.gz -r 1024x768 /' /usr/share/genkernel/genkernel
+                       ;;
+               esac
        ;;
 esac