From: Chris Gianelloni Date: Wed, 2 Mar 2005 21:47:41 +0000 (+0000) Subject: Made splash reduction to 1024x768 only for minimal and universal release media. X-Git-Tag: CATALYST_2_0_6_916~822 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff673de0f0e4dde2d223efae8b5ba29c725b8fce;p=catalyst.git Made splash reduction to 1024x768 only for minimal and universal release media. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@551 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index a1dbaa1f..ed6378c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.176 2005/03/02 02:37:56 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.177 2005/03/02 21:47:41 wolf31o2 Exp $ + + 02 Mar 2005; Chris Gianelloni + livecd/runscript-support/pre-kmerge.sh: + Made splash reduction to 1024x768 only for minimal and universal release media. 01 Mar 2005; Chris Gianelloni targets/stage1/stage1-preclean2-chroot.sh: diff --git a/livecd/runscript-support/pre-kmerge.sh b/livecd/runscript-support/pre-kmerge.sh index 6d8b599b..3b0dd7e4 100755 --- a/livecd/runscript-support/pre-kmerge.sh +++ b/livecd/runscript-support/pre-kmerge.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/pre-kmerge.sh,v 1.7 2004/11/02 23:23:16 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/pre-kmerge.sh,v 1.8 2005/03/02 21:47:41 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -15,4 +15,9 @@ install -d /usr/portage/packages/gk_binaries rm -f /usr/src/linux sed -i 's/uchi-hcd/uhci-hcd/' /usr/share/genkernel/x86/modules_load -sed -i 's/initramfs_data.cpio.gz /initramfs_data.cpio.gz -r 1024x768 /' /usr/share/genkernel/genkernel + +if [ "${clst_livecd_type}" = "gentoo-release-minimal" ] \ + [ "${clst_livecd_type}" = "gentoo-release-universal" ]; then + sed -i 's/initramfs_data.cpio.gz /initramfs_data.cpio.gz -r 1024x768 /'\ + /usr/share/genkernel/genkernel +fi