* [gentoo-commits] genkernel r605 - in trunk: . generic
@ 2008-02-28 21:25 99% Chris Gianelloni (wolf31o2)
0 siblings, 0 replies; 1+ results
From: Chris Gianelloni (wolf31o2) @ 2008-02-28 21:25 UTC (permalink / raw
To: gentoo-commits
Author: wolf31o2
Date: 2008-02-28 21:25:31 +0000 (Thu, 28 Feb 2008)
New Revision: 605
Modified:
trunk/ChangeLog
trunk/gen_initramfs.sh
trunk/generic/linuxrc
Log:
Use which to determine the location of splash_geninitramfs, rather than having an endless number of conditional checks for the location. This fixes bug #211521. Thanks to Uriy Zhuravlev <stalkerg@gmail.com> for finding the problem and suggesting a solution.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-02-20 19:50:49 UTC (rev 604)
+++ trunk/ChangeLog 2008-02-28 21:25:31 UTC (rev 605)
@@ -2,6 +2,13 @@
# Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh,
+ generic/linuxrc:
+ Use which to determine the location of splash_geninitramfs, rather than
+ having an endless number of conditional checks for the location. This fixes
+ bug #211521. Thanks to Uriy Zhuravlev <stalkerg@gmail.com> for finding the
+ problem and suggesting a solution.
+
20 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
-xenU/kernel-config-2.6, -xen0/kernel-config-2.6, genkernel,
-xen0/busy-config, -xen0/config.sh, -xen0/modules_load, -xenU/busy-config,
Modified: trunk/gen_initramfs.sh
===================================================================
--- trunk/gen_initramfs.sh 2008-02-20 19:50:49 UTC (rev 604)
+++ trunk/gen_initramfs.sh 2008-02-28 21:25:31 UTC (rev 605)
@@ -212,7 +212,8 @@
}
append_splash(){
- if [ -x /usr/bin/splash_geninitramfs ] || [ -x /sbin/splash_geninitramfs ]
+ splash_geninitramfs=`which splash_geninitramfs 2>1&`
+ if [ -x ${splash_geninitramfs} ]
then
[ -z "${SPLASH_THEME}" ] && [ -e /etc/conf.d/splash ] && source /etc/conf.d/splash
[ -z "${SPLASH_THEME}" ] && SPLASH_THEME=default
Modified: trunk/generic/linuxrc
===================================================================
--- trunk/generic/linuxrc 2008-02-20 19:50:49 UTC (rev 604)
+++ trunk/generic/linuxrc 2008-02-28 21:25:31 UTC (rev 605)
@@ -39,7 +39,7 @@
quiet_kmsg
-CMDLINE="`cat /proc/cmdline`"
+CMDLINE=`cat /proc/cmdline`
# Scan CMDLINE for any specified real_root= or cdroot arguments
REAL_ROOT=''
FAKE_ROOT=''
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2008-02-28 21:25 99% [gentoo-commits] genkernel r605 - in trunk: . generic Chris Gianelloni (wolf31o2)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox