Added fix from bug #119123. This is catalyst 2.0_rc16.

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

diff --git a/ChangeLog b/ChangeLog
index 2686dc9e3958456c7431a2d0dacba403dd1db647..8d6abfe23043357147d2e199b209d8cb5a86c0bc 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.509 2006/01/16 15:25:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.510 2006/01/16 15:45:03 wolf31o2 Exp $
+
+  16 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/bootloader-setup.sh:
+  Added fix from bug #119123.  This is catalyst 2.0_rc16.
 
   16 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   targets/support/create-iso.sh, targets/support/netboot2-final.sh:

diff --git a/catalyst b/catalyst
index eb70cdf6c783f3deb921aa06e02bd8f27c7900a0..8114174414c98bfb65daae75339d7960656b781a 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.123 2006/01/16 15:25:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.124 2006/01/16 15:45:03 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_rc15"
+__version__="2.0_rc16"
 
 conf_values={}
 

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 8543d48dd3f4c9bc378eec29bb1dee142b6330ae..d20a4338dda446267fc10411a789a763415d89ea 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.22 2005/12/16 18:57:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.23 2006/01/16 15:45:03 wolf31o2 Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
@@ -75,7 +75,7 @@ case ${clst_mainarch} in
                        echo >> ${icfg}
                        echo "image=/boot/${x}" >> ${icfg}
 
-                       if [ -e "/boot/${x}.igz" ]
+                       if [ -e "$1/boot/${x}.igz" ]
                        then
                                echo "initrd=/boot/${x}.igz" >> ${icfg}
                        fi