Fixing some spacing. This is catalyst 2.0_rc15.

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

diff --git a/ChangeLog b/ChangeLog
index c915f12836dc0a18fa4cab772bdfccaa6cb4bc11..2686dc9e3958456c7431a2d0dacba403dd1db647 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.508 2006/01/16 14:47:01 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.509 2006/01/16 15:25:08 wolf31o2 Exp $
+
+  16 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/create-iso.sh, targets/support/netboot2-final.sh:
+  Fixing some spacing.  This is catalyst 2.0_rc15.
 
   16 Jan 2006; Eric Edgar <rocket@gentoo.org> targets/support/functions.sh:
   Attempt to fix bug 117649

diff --git a/catalyst b/catalyst
index fa948bd3acdd5ab270d43bbfa53e317a42576f13..eb70cdf6c783f3deb921aa06e02bd8f27c7900a0 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.122 2006/01/13 14:54:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.123 2006/01/16 15:25:08 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_rc14"
+__version__="2.0_rc15"
 
 conf_values={}
 

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 57953c33e9dfdb7410ab7593f66c21a42b4861e7..c6259478c9e3da79cd0eb2fef116d5d68d71af0f 100755 (executable)
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -1,7 +1,8 @@
 #!/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/create-iso.sh,v 1.20 2006/01/10 15:40:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.21 2006/01/16 15:25:08 wolf31o2 Exp $
+
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
@@ -63,7 +64,7 @@ then
                                sh)
                                        clst_iso_volume_id="Gentoo Linux - SH"
                                ;;
-                               sparc|sparc64)
+                               sparc*)
                                        clst_iso_volume_id="Gentoo Linux - SPARC"
                                ;;
                                x86)
@@ -148,7 +149,7 @@ case ${clst_mainarch} in
                        ;;
                esac
        ;;
-       sparc|sparc64)
+       sparc*)
                # Old silo + patched mkisofs fubar magic
                # Only silo 1.2.x seems to work for most hardware
                # Seems silo 1.3.x+ breaks on newer machines

diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index 3c09ddc042d1d4b1830675112eab9f4e7b3876a7..a4b1b182a9dd4c9681765c5339ea1a6db731a79b 100755 (executable)
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -1,7 +1,8 @@
 #!/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/netboot2-final.sh,v 1.1 2006/01/13 15:09:07 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/netboot2-final.sh,v 1.2 2006/01/16 15:25:08 wolf31o2 Exp $
+
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
@@ -17,11 +18,11 @@ for x in ${clst_boot_kernel}; do
        mv ${clst_target_path}boot/${x} ${clst_target_path}kernels
        mv ${clst_target_path}boot/${x}.igz ${clst_target_path}kernels/misc
 done
-rmdir ${clst_target_path}boot
 
+rmdir ${clst_target_path}boot
 
-# Any post-processing necessary for each architecture can be done here.  This may
-# include things like sparc's elftoaout, x86's PXE boot, etc.
+# Any post-processing necessary for each architecture can be done here.  This
+# may include things like sparc's elftoaout, x86's PXE boot, etc.
 case ${clst_mainarch} in
        alpha)
                sleep 0