From: Chris Gianelloni Date: Thu, 20 Apr 2006 01:33:12 +0000 (+0000) Subject: If you use elif, you have to use a then after it. Yeah, that one's totally my fault. X-Git-Tag: CATALYST_2_0_6_916~375 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8d2e22897196c5defcc19f554d0c332798d9cb62;p=catalyst.git If you use elif, you have to use a then after it. Yeah, that one's totally my fault. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1119 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 9e086859..f82b83a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.604 2006/04/19 15:34:08 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.605 2006/04/20 01:33:12 wolf31o2 Exp $ + + 20 Apr 2006; Chris Gianelloni + targets/support/bootloader-setup.sh: + If you use elif, you have to use a then after it. Yeah, that one's totally + my fault. 19 Apr 2006; Chris Gianelloni catalyst, targets/support/livecdfs-update.sh: diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh index 096ff92d..c58a647f 100755 --- a/targets/support/bootloader-setup.sh +++ b/targets/support/bootloader-setup.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.34 2006/04/19 14:28:40 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.35 2006/04/20 01:33:12 wolf31o2 Exp $ . ${clst_sharedir}/targets/support/functions.sh . ${clst_sharedir}/targets/support/filesystem-functions.sh @@ -373,6 +373,7 @@ case ${clst_mainarch} in 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} elif [ "${clst_livecd_splash_type}" == "bootplash" -a -n "${clst_livecd_splash_theme}" ] + then echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791 splash=silent" >> ${icfg} else echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791" >> ${icfg} @@ -393,6 +394,7 @@ case ${clst_mainarch} in then echo " append ${default_append_line} initrd=${x}.igz vga=791 splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet" >> ${icfg} elif [ "${clst_livecd_splash_type}" == "bootplash" -a -n "${clst_livecd_splash_theme}" ] + then echo " append ${default_append_line} initrd=${x}.igz vga=791 splash=silent" >> ${icfg} else echo " append ${default_append_line} initrd=${x}.igz vga=791" >> ${icfg} @@ -469,6 +471,7 @@ case ${clst_mainarch} in then echo "kernel /boot/${x} softlevel=${y} ${default_append_line} vga=791 splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet" >> ${icfg} elif [ "${clst_livecd_splash_type}" == "bootplash" -a -n "${clst_livecd_splash_theme}" ] + then echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791 splash=silent" >> ${icfg} else echo " append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791" >> ${icfg} @@ -492,6 +495,7 @@ case ${clst_mainarch} in then echo "kernel /boot/${x} ${default_append_line} vga=791 splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet" >> ${icfg} elif [ "${clst_livecd_splash_type}" == "bootplash" -a -n "${clst_livecd_splash_theme}" ] + then echo "kernel /boot/${x} ${default_append_line} vga=791 splash=silent" >> ${icfg} else echo "kernel /boot/${x} ${default_append_line} vga=791" >> ${icfg}