I missed an extra else in bootloader-setup.sh, so I'm fixing that and rolling out...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1120 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index f82b83a339d86d2bb0cbe57966a30094950a7791..4759d206cd9b2c762a9c886f8303219b6d195cdc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.605 2006/04/20 01:33:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.606 2006/04/20 15:17:01 wolf31o2 Exp $
+
+  20 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/livecd-stage2/livecd-stage2-controller.sh,
+  targets/support/bootloader-setup.sh:
+  I missed an extra else in bootloader-setup.sh, so I'm fixing that and
+  rolling out an emergency rc44.
 
   20 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/bootloader-setup.sh:

diff --git a/catalyst b/catalyst
index 9b7a9e52392e7c8c8d22157f1afc90e3bd30602e..cb70012afef74226af5384ebd43663a268f4c1fa 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python -OO
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.151 2006/04/19 15:34:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.152 2006/04/20 15:17:01 wolf31o2 Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -11,7 +11,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0_rc43"
+__version__="2.0_rc44"
 
 conf_values={}
 

diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 5f707dfb616c93973f5f3bb20571ded29f74298f..8009eb88193b910f41f5580080bf56f4c61138c5 100755 (executable)
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh,v 1.20 2006/03/22 19:11:24 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh,v 1.21 2006/04/20 15:17:01 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
@@ -88,7 +88,7 @@ case $1 in
                
                
                # Move over the xinitrc (if applicable)
-               # Tthis is moved here, so we can override any default xinitrc
+               # This is moved here, so we can override any default xinitrc
                if [ -n "${clst_livecd_xinitrc}" ]
                then
                        cp -f ${clst_livecd_xinitrc} \

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index c58a647fde7e615fc2757c99d7329e336bd53cde..b259cfc77d0d12a71cc58df3091384a2585a1dfc 100755 (executable)
--- 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.35 2006/04/20 01:33:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.36 2006/04/20 15:17:01 wolf31o2 Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
@@ -475,7 +475,7 @@ case ${clst_mainarch} in
                                                        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}
-                                               fi                                              else
+                                               fi
                                                if [ -e $1/boot/${x}.igz ]
                                                then
                                                        echo "initrd /boot/${x}.igz" >> ${icfg}