1 |
Author: wolf31o2 |
2 |
Date: 2008-02-28 21:25:31 +0000 (Thu, 28 Feb 2008) |
3 |
New Revision: 605 |
4 |
|
5 |
Modified: |
6 |
trunk/ChangeLog |
7 |
trunk/gen_initramfs.sh |
8 |
trunk/generic/linuxrc |
9 |
Log: |
10 |
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@×××××.com> for finding the problem and suggesting a solution. |
11 |
|
12 |
Modified: trunk/ChangeLog |
13 |
=================================================================== |
14 |
--- trunk/ChangeLog 2008-02-20 19:50:49 UTC (rev 604) |
15 |
+++ trunk/ChangeLog 2008-02-28 21:25:31 UTC (rev 605) |
16 |
@@ -2,6 +2,13 @@ |
17 |
# Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2 |
18 |
# $Header: $ |
19 |
|
20 |
+ 28 Feb 2008; Chris Gianelloni <wolf31o2@g.o> gen_initramfs.sh, |
21 |
+ generic/linuxrc: |
22 |
+ Use which to determine the location of splash_geninitramfs, rather than |
23 |
+ having an endless number of conditional checks for the location. This fixes |
24 |
+ bug #211521. Thanks to Uriy Zhuravlev <stalkerg@×××××.com> for finding the |
25 |
+ problem and suggesting a solution. |
26 |
+ |
27 |
20 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
28 |
-xenU/kernel-config-2.6, -xen0/kernel-config-2.6, genkernel, |
29 |
-xen0/busy-config, -xen0/config.sh, -xen0/modules_load, -xenU/busy-config, |
30 |
|
31 |
Modified: trunk/gen_initramfs.sh |
32 |
=================================================================== |
33 |
--- trunk/gen_initramfs.sh 2008-02-20 19:50:49 UTC (rev 604) |
34 |
+++ trunk/gen_initramfs.sh 2008-02-28 21:25:31 UTC (rev 605) |
35 |
@@ -212,7 +212,8 @@ |
36 |
} |
37 |
|
38 |
append_splash(){ |
39 |
- if [ -x /usr/bin/splash_geninitramfs ] || [ -x /sbin/splash_geninitramfs ] |
40 |
+ splash_geninitramfs=`which splash_geninitramfs 2>1&` |
41 |
+ if [ -x ${splash_geninitramfs} ] |
42 |
then |
43 |
[ -z "${SPLASH_THEME}" ] && [ -e /etc/conf.d/splash ] && source /etc/conf.d/splash |
44 |
[ -z "${SPLASH_THEME}" ] && SPLASH_THEME=default |
45 |
|
46 |
Modified: trunk/generic/linuxrc |
47 |
=================================================================== |
48 |
--- trunk/generic/linuxrc 2008-02-20 19:50:49 UTC (rev 604) |
49 |
+++ trunk/generic/linuxrc 2008-02-28 21:25:31 UTC (rev 605) |
50 |
@@ -39,7 +39,7 @@ |
51 |
|
52 |
quiet_kmsg |
53 |
|
54 |
-CMDLINE="`cat /proc/cmdline`" |
55 |
+CMDLINE=`cat /proc/cmdline` |
56 |
# Scan CMDLINE for any specified real_root= or cdroot arguments |
57 |
REAL_ROOT='' |
58 |
FAKE_ROOT='' |
59 |
|
60 |
-- |
61 |
gentoo-commits@l.g.o mailing list |