Gentoo Archives: gentoo-commits

From: "Chris Gianelloni (wolf31o2)" <wolf31o2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] catalyst r1342 - in trunk: . targets/support
Date: Thu, 28 Feb 2008 17:33:33
Message-Id: E1JUmdO-0004ou-7R@stork.gentoo.org
1 Author: wolf31o2
2 Date: 2008-02-28 17:33:29 +0000 (Thu, 28 Feb 2008)
3 New Revision: 1342
4
5 Modified:
6 trunk/ChangeLog
7 trunk/targets/support/bootloader-setup.sh
8 Log:
9 Let's change our splash checking to a global check so it only needs to be done once. This makes much more sense than having all of those if ... else ... statements.
10
11 Modified: trunk/ChangeLog
12 ===================================================================
13 --- trunk/ChangeLog 2008-02-28 17:24:31 UTC (rev 1341)
14 +++ trunk/ChangeLog 2008-02-28 17:33:29 UTC (rev 1342)
15 @@ -2,6 +2,12 @@
16 # $Id: $
17
18 28 Feb 2008; Chris Gianelloni <wolf31o2@g.o>
19 + targets/support/bootloader-setup.sh:
20 + Let's change our splash checking to a global check so it only needs to be
21 + done once. This makes much more sense than having all of those if ... else
22 + ... statements.
23 +
24 + 28 Feb 2008; Chris Gianelloni <wolf31o2@g.o>
25 targets/stage1/stage1-chroot.sh, targets/support/kmerge.sh:
26 Fix our USE invocation here so things work as expected.
27
28
29 Modified: trunk/targets/support/bootloader-setup.sh
30 ===================================================================
31 --- trunk/targets/support/bootloader-setup.sh 2008-02-28 17:24:31 UTC (rev 1341)
32 +++ trunk/targets/support/bootloader-setup.sh 2008-02-28 17:33:29 UTC (rev 1342)
33 @@ -11,6 +11,7 @@
34 check_filesystem_type
35
36 default_append_line="root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot"
37 +[ -n "${clst_splash_theme}" ] && default_append_line="${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet"
38
39 case ${clst_hostarch} in
40 alpha)
41 @@ -81,12 +82,7 @@
42
43 echo "label=${x}" >> ${icfg}
44 echo "read-write" >> ${icfg}
45 - if [ -n "${clst_livecd_splash_theme}" ]
46 - then
47 - echo "append=\"${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet\"" >> ${icfg}
48 - else
49 - echo "append=\"${default_append_line}\"" >> ${icfg}
50 - fi
51 + echo "append=\"${default_append_line}\"" >> ${icfg}
52 done
53 ;;
54 ppc64)
55 @@ -136,12 +132,7 @@
56
57 echo "label=${x}" >> ${etc_icfg}
58 echo "read-write" >> ${icfg}
59 - if [ -n "${clst_livecd_splash_theme}" ]
60 - then
61 - echo "append=\"${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet\"" >> ${etc_icfg}
62 - else
63 - echo "append=\"${default_append_line}\"" >> ${etc_icfg}
64 - fi
65 + echo "append=\"${default_append_line}\"" >> ${etc_icfg}
66
67 for y in ${clst_kernel_console}
68 do
69 @@ -169,12 +160,7 @@
70
71 echo "label=${x}" >> ${etc_icfg}
72 echo "read-write" >> ${etc_icfg}
73 - if [ -n "${clst_livecd_splash_theme}" ]
74 - then
75 - echo "append=\"${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet\"" >> ${etc_icfg}
76 - else
77 - echo "append=\"${default_append_line}\"" >> ${etc_icfg}
78 - fi
79 + echo "append=\"${default_append_line}\"" >> ${etc_icfg}
80 fi
81 else
82 if [ -n "${clst_kernel_console}" ]
83 @@ -189,12 +175,7 @@
84
85 echo "label=${x}" >> ${icfg}
86 echo "read-write" >> ${icfg}
87 - if [ -n "${clst_livecd_splash_theme}" ]
88 - then
89 - echo "append=\"${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet\"" >> ${icfg}
90 - else
91 - echo "append=\"${default_append_line}\"" >> ${icfg}
92 - fi
93 + echo "append=\"${default_append_line}\"" >> ${icfg}
94
95 for y in ${clst_kernel_console}
96 do
97 @@ -221,12 +202,7 @@
98
99 echo "label=${x}" >> ${icfg}
100 echo "read-write" >> ${icfg}
101 - if [ -n "${clst_livecd_splash_theme}" ]
102 - then
103 - echo "append=\"${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet\"" >> ${icfg}
104 - else
105 - echo "append=\"${default_append_line}\"" >> ${icfg}
106 - fi
107 + echo "append=\"${default_append_line}\"" >> ${icfg}
108 fi
109 fi
110 done
111 @@ -336,12 +312,7 @@
112 do
113 echo "label ${x}-${y}" >> ${icfg}
114 echo " kernel ${x}" >> ${icfg}
115 - if [ -n "${clst_livecd_splash_theme}" ]
116 - then
117 - echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791 splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet" >> ${icfg}
118 - else
119 - echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791" >> ${icfg}
120 - fi
121 + echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791" >> ${icfg}
122
123 echo >> ${icfg}
124 echo " ${x}" >> ${kmsg}
125 @@ -354,12 +325,7 @@
126 else
127 echo "label ${x}" >> ${icfg}
128 echo " kernel ${x}" >> ${icfg}
129 - if [ -n "${clst_livecd_splash_theme}" ]
130 - then
131 - echo " append ${default_append_line} initrd=${x}.igz vga=791 splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet" >> ${icfg}
132 - else
133 - echo " append ${default_append_line} initrd=${x}.igz vga=791" >> ${icfg}
134 - fi
135 + echo " append ${default_append_line} initrd=${x}.igz vga=791" >> ${icfg}
136 echo >> ${icfg}
137 echo " ${x}" >> ${kmsg}
138 echo "label ${x}-nofb" >> ${icfg}
139 @@ -436,12 +402,7 @@
140 for y in ${clst_kernel_softlevel}
141 do
142 echo "title ${x}-${y}" >> ${icfg}
143 - if [ -n "${clst_livecd_splash_theme}" ]
144 - then
145 - echo "kernel /boot/${x} softlevel=${y} ${default_append_line} vga=791 splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet" >> ${icfg}
146 - else
147 - echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791" >> ${icfg}
148 - fi
149 + echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791" >> ${icfg}
150 if [ -e $1/boot/${x}.igz ]
151 then
152 echo "initrd /boot/${x}.igz" >> ${icfg}
153 @@ -457,12 +418,7 @@
154 done
155 else
156 echo "title ${x}" >> ${icfg}
157 - if [ -n "${clst_livecd_splash_theme}" ]
158 - then
159 - echo "kernel /boot/${x} ${default_append_line} vga=791 splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet" >> ${icfg}
160 - else
161 - echo "kernel /boot/${x} ${default_append_line} vga=791" >> ${icfg}
162 - fi
163 + echo "kernel /boot/${x} ${default_append_line} vga=791" >> ${icfg}
164 if [ -e $1/boot/${x}.igz ]
165 then
166 echo "initrd /boot/${x}.igz" >> ${icfg}
167
168 --
169 gentoo-commits@l.g.o mailing list