* [gentoo-commits] catalyst r1342 - in trunk: . targets/support
@ 2008-02-28 17:33 99% Chris Gianelloni (wolf31o2)
0 siblings, 0 replies; 1+ results
From: Chris Gianelloni (wolf31o2) @ 2008-02-28 17:33 UTC (permalink / raw
To: gentoo-commits
Author: wolf31o2
Date: 2008-02-28 17:33:29 +0000 (Thu, 28 Feb 2008)
New Revision: 1342
Modified:
trunk/ChangeLog
trunk/targets/support/bootloader-setup.sh
Log:
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.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-02-28 17:24:31 UTC (rev 1341)
+++ trunk/ChangeLog 2008-02-28 17:33:29 UTC (rev 1342)
@@ -2,6 +2,12 @@
# $Id: $
28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+ targets/support/bootloader-setup.sh:
+ 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.
+
+ 28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
targets/stage1/stage1-chroot.sh, targets/support/kmerge.sh:
Fix our USE invocation here so things work as expected.
Modified: trunk/targets/support/bootloader-setup.sh
===================================================================
--- trunk/targets/support/bootloader-setup.sh 2008-02-28 17:24:31 UTC (rev 1341)
+++ trunk/targets/support/bootloader-setup.sh 2008-02-28 17:33:29 UTC (rev 1342)
@@ -11,6 +11,7 @@
check_filesystem_type
default_append_line="root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot"
+[ -n "${clst_splash_theme}" ] && default_append_line="${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet"
case ${clst_hostarch} in
alpha)
@@ -81,12 +82,7 @@
echo "label=${x}" >> ${icfg}
echo "read-write" >> ${icfg}
- if [ -n "${clst_livecd_splash_theme}" ]
- then
- echo "append=\"${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet\"" >> ${icfg}
- else
- echo "append=\"${default_append_line}\"" >> ${icfg}
- fi
+ echo "append=\"${default_append_line}\"" >> ${icfg}
done
;;
ppc64)
@@ -136,12 +132,7 @@
echo "label=${x}" >> ${etc_icfg}
echo "read-write" >> ${icfg}
- if [ -n "${clst_livecd_splash_theme}" ]
- then
- echo "append=\"${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet\"" >> ${etc_icfg}
- else
- echo "append=\"${default_append_line}\"" >> ${etc_icfg}
- fi
+ echo "append=\"${default_append_line}\"" >> ${etc_icfg}
for y in ${clst_kernel_console}
do
@@ -169,12 +160,7 @@
echo "label=${x}" >> ${etc_icfg}
echo "read-write" >> ${etc_icfg}
- if [ -n "${clst_livecd_splash_theme}" ]
- then
- echo "append=\"${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet\"" >> ${etc_icfg}
- else
- echo "append=\"${default_append_line}\"" >> ${etc_icfg}
- fi
+ echo "append=\"${default_append_line}\"" >> ${etc_icfg}
fi
else
if [ -n "${clst_kernel_console}" ]
@@ -189,12 +175,7 @@
echo "label=${x}" >> ${icfg}
echo "read-write" >> ${icfg}
- if [ -n "${clst_livecd_splash_theme}" ]
- then
- echo "append=\"${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet\"" >> ${icfg}
- else
- echo "append=\"${default_append_line}\"" >> ${icfg}
- fi
+ echo "append=\"${default_append_line}\"" >> ${icfg}
for y in ${clst_kernel_console}
do
@@ -221,12 +202,7 @@
echo "label=${x}" >> ${icfg}
echo "read-write" >> ${icfg}
- if [ -n "${clst_livecd_splash_theme}" ]
- then
- echo "append=\"${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet\"" >> ${icfg}
- else
- echo "append=\"${default_append_line}\"" >> ${icfg}
- fi
+ echo "append=\"${default_append_line}\"" >> ${icfg}
fi
fi
done
@@ -336,12 +312,7 @@
do
echo "label ${x}-${y}" >> ${icfg}
echo " kernel ${x}" >> ${icfg}
- if [ -n "${clst_livecd_splash_theme}" ]
- then
- echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791 splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet" >> ${icfg}
- else
- echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791" >> ${icfg}
- fi
+ echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791" >> ${icfg}
echo >> ${icfg}
echo " ${x}" >> ${kmsg}
@@ -354,12 +325,7 @@
else
echo "label ${x}" >> ${icfg}
echo " kernel ${x}" >> ${icfg}
- if [ -n "${clst_livecd_splash_theme}" ]
- then
- echo " append ${default_append_line} initrd=${x}.igz vga=791 splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet" >> ${icfg}
- else
- echo " append ${default_append_line} initrd=${x}.igz vga=791" >> ${icfg}
- fi
+ echo " append ${default_append_line} initrd=${x}.igz vga=791" >> ${icfg}
echo >> ${icfg}
echo " ${x}" >> ${kmsg}
echo "label ${x}-nofb" >> ${icfg}
@@ -436,12 +402,7 @@
for y in ${clst_kernel_softlevel}
do
echo "title ${x}-${y}" >> ${icfg}
- if [ -n "${clst_livecd_splash_theme}" ]
- then
- echo "kernel /boot/${x} softlevel=${y} ${default_append_line} vga=791 splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet" >> ${icfg}
- else
- echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791" >> ${icfg}
- fi
+ echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791" >> ${icfg}
if [ -e $1/boot/${x}.igz ]
then
echo "initrd /boot/${x}.igz" >> ${icfg}
@@ -457,12 +418,7 @@
done
else
echo "title ${x}" >> ${icfg}
- if [ -n "${clst_livecd_splash_theme}" ]
- then
- echo "kernel /boot/${x} ${default_append_line} vga=791 splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet" >> ${icfg}
- else
- echo "kernel /boot/${x} ${default_append_line} vga=791" >> ${icfg}
- fi
+ echo "kernel /boot/${x} ${default_append_line} vga=791" >> ${icfg}
if [ -e $1/boot/${x}.igz ]
then
echo "initrd /boot/${x}.igz" >> ${icfg}
--
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 17:33 99% [gentoo-commits] catalyst r1342 - in trunk: . targets/support 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