fixing catalyst.conf location bug

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

diff --git a/ChangeLog b/ChangeLog
index 7d081c2497c983ebacfe0349d9706303cf08d5ab..a1a81a8814165dd4b85dbe6871f0eb0debc26d0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.22 2004/03/04 19:34:11 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.23 2004/03/05 06:24:17 zhen Exp $
+
+  05 Mar 2004; John Davis <zhen@gentoo.org> catalyst:
+  changing location of /etc/catalyst.conf to /etc/catalyst/catalyst.conf
 
   04 Mar 2004; John Davis <zhen@gentoo.org> alpha-isogen.sh,
   examples/livecd/alpha/alpha-livecd-stage1-20040225.spec,

diff --git a/catalyst b/catalyst
index 0b1a795045137fbf393b1d5618831833d149f140..4d39b4cf1f388e5a3478cd05401d68796010cf18 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.29 2004/02/12 19:51:37 drobbins Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.30 2004/03/05 06:24:17 zhen Exp $
 
 import os,sys,imp,string
 
@@ -32,7 +32,7 @@ if os.getuid()!=0:
 
 myspec={}
 myconf={}
-myconffile="/etc/catalyst.conf"
+myconffile="/etc/catalyst/catalyst.conf"
 if os.environ.has_key("clst_conf"):
        if not os.path.exists(os.environ["clst_conf"]):
                print "catalyst: Unable to find config file specified in env var 'clst_conf'"