summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Joseph Barnhart Clark <dclark@pobox.com>2006-07-16 14:53:10 +0000
committerDaniel Joseph Barnhart Clark <dclark@pobox.com>2006-07-16 14:53:10 +0000
commit9435943d4ed514e0f664a2b5acbe35d4dc9ee243 (patch)
tree7c54053a2ff12c0ac22b2901dfb893af63f20470
parent45281c0e2ee5d42c2577a6d34d53cd68885aa375 (diff)
downloadbcfg2-9435943d4ed514e0f664a2b5acbe35d4dc9ee243.tar.gz
bcfg2-9435943d4ed514e0f664a2b5acbe35d4dc9ee243.tar.bz2
bcfg2-9435943d4ed514e0f664a2b5acbe35d4dc9ee243.zip
Patch to change paths to /usr/local, to be more consistant with the standard
encap/epkg scheme. This is a quick hack to get the encap packages to work; the right way would probably be to get setup.py to change the paths based on --prefix and/or to abstract paths in the various files this diff applies to (esp. in the case of the nonstandard place mcs puts epkg / encap packages). This file will be downloaded by the encap bcfg2 profile and applied to the source tree via a <patch> section. git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1955 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--encap/patches/usr-local.diff171
1 files changed, 171 insertions, 0 deletions
diff --git a/encap/patches/usr-local.diff b/encap/patches/usr-local.diff
new file mode 100644
index 000000000..9f8ad57ee
--- /dev/null
+++ b/encap/patches/usr-local.diff
@@ -0,0 +1,171 @@
+Index: src/lib/Options.py
+===================================================================
+--- src/lib/Options.py (revision 1954)
++++ src/lib/Options.py (working copy)
+@@ -5,7 +5,7 @@
+ # (option, env, cfpath, default value, option desc, boolean, arg desc)
+ # ((option, arg desc, opt desc), env, cfpath, default, boolean)
+ bootstrap = {'configfile': (('-C', '<configfile>', 'Path to config file'),
+- 'BCFG2_CONF', False, '/etc/bcfg2.conf', False)}
++ 'BCFG2_CONF', False, '/usr/local/etc/bcfg2.conf', False)}
+
+ class OptionFailure(Exception):
+ pass
+Index: src/lib/Server/Component.py
+===================================================================
+--- src/lib/Server/Component.py (revision 1954)
++++ src/lib/Server/Component.py (working copy)
+@@ -108,7 +108,7 @@
+ if setup['configfile']:
+ cfilename = setup['configfile']
+ else:
+- cfilename = '/etc/bcfg2.conf'
++ cfilename = '/usr/local/etc/bcfg2.conf'
+ self.cfile.read([cfilename])
+ if not self.cfile.has_section('communication'):
+ print "Configfile missing communication section"
+Index: src/lib/Client/Solaris.py
+===================================================================
+--- src/lib/Client/Solaris.py (revision 1954)
++++ src/lib/Client/Solaris.py (working copy)
+@@ -28,7 +28,7 @@
+ and standard SMF services'''
+ pkgtool = {'sysv':("/usr/sbin/pkgadd %s -d %%s -n %%%%s", (("%s", ["name"]))),
+ 'blast':("/opt/csw/bin/pkg-get install %s", ("%s", ["name"])),
+- 'encap':("/local/sbin/epkg -l -q %s", ("%s", ["url"]))}
++ 'encap':("/usr/local/bin/epkg -l -q %s", ("%s", ["url"]))}
+ splitter = regcompile('.*/(?P<name>[\w-]+)\-(?P<version>[\w\.-]+)')
+ ptypes = {}
+ __name__ = 'Solaris'
+@@ -71,7 +71,7 @@
+ self.installed[pkg] = version
+ self.ptypes[pkg] = 'sysv'
+ # try to find encap packages
+- for pkg in glob("/local/encap/*"):
++ for pkg in glob("/usr/local/encap/*"):
+ match = self.splitter.match(pkg)
+ if match:
+ self.installed[match.group('name')] = match.group('version')
+@@ -141,7 +141,7 @@
+ if entry.get('type') in ['sysv', 'blast'] or entry.get('type')[:4] == 'sysv':
+ cmdrc = self.saferun("/usr/bin/pkginfo -q -v \"%s\" %s" % (entry.get('version'), entry.get('name')))[0]
+ elif entry.get('type') in ['encap']:
+- cmdrc = self.saferun("/local/sbin/epkg -q -k %s-%s >/dev/null" %
++ cmdrc = self.saferun("/usr/local/bin/epkg -q -k %s-%s >/dev/null" %
+ (entry.get('name'), entry.get('version')))[0]
+ if cmdrc != 0:
+ self.logger.debug("Package %s version incorrect" % entry.get('name'))
+@@ -190,7 +190,7 @@
+ if not self.saferun("/usr/sbin/pkgrm -n %s" % " ".join(sysvrmpkgs))[0]:
+ [self.pkgwork['remove'].remove(pkg) for pkg in sysvrmpkgs]
+ if enrmpkgs:
+- if not self.saferun("/local/sbin/epkg -l -q -r %s" % " ".join(enrmpkgs))[0]:
++ if not self.saferun("/usr/local/bin/epkg -l -q -r %s" % " ".join(enrmpkgs))[0]:
+ [self.pkgwork['remove'].remove(pkg) for pkg in enrmpkgs]
+ else:
+ self.logger.info("Need to remove packages: %s" % (self.pkgwork['remove']))
+Index: src/lib/Client/Proxy.py
+===================================================================
+--- src/lib/Client/Proxy.py (revision 1954)
++++ src/lib/Client/Proxy.py (working copy)
+@@ -123,7 +123,7 @@
+ class SafeProxy:
+ '''Wrapper for proxy'''
+ _cfile = ConfigParser.ConfigParser()
+- _cfpath = '/etc/bcfg2.conf'
++ _cfpath = '/usr/local/etc/bcfg2.conf'
+ _cfile.read([_cfpath])
+ try:
+ _components = _cfile._sections['components']
+Index: src/sbin/bcfg2
+===================================================================
+--- src/sbin/bcfg2 (revision 1954)
++++ src/sbin/bcfg2 (working copy)
+@@ -51,8 +51,8 @@
+ False, False, False, False),
+ 'help': (('-h', False, "print this help message"),
+ False, False, False, False),
+- 'setup': (('-C', '<configfile>', "use given config file (default /etc/bcfg2.conf)"),
+- False, False, '/etc/bcfg2.conf', False),
++ 'setup': (('-C', '<configfile>', "use given config file (default /usr/local/etc/bcfg2.conf)"),
++ False, False, '/usr/local/etc/bcfg2.conf', False),
+ 'server': (('-S', '<server url>', 'the server hostname to connect to'),
+ False, ('components', 'bcfg2'), 'https://localhost:6789', False),
+ 'user': (('-u', '<user>', 'the user to provide for authentication'),
+Index: src/sbin/GenerateHostInfo
+===================================================================
+--- src/sbin/GenerateHostInfo (revision 1954)
++++ src/sbin/GenerateHostInfo (working copy)
+@@ -12,7 +12,7 @@
+
+ if __name__ == '__main__':
+ c = ConfigParser()
+- c.read(['/etc/bcfg2.conf'])
++ c.read(['/usr/local/etc/bcfg2.conf'])
+ configpath = "%s/etc/report-configuration.xml" % c.get('server', 'repository')
+ clientdatapath = "%s/Metadata/clients.xml" % c.get('server', 'repository')
+ sendmailpath = c.get('statistics','sendmailpath')
+Index: src/sbin/bcfg2-server
+===================================================================
+--- src/sbin/bcfg2-server (revision 1954)
++++ src/sbin/bcfg2-server (working copy)
+@@ -182,7 +182,7 @@
+ 'daemon': (('-D', '<pidfile>', 'daemonize the server, storing PID'),
+ False, False, False, False),
+ 'configfile': (('-C', '<conffile>', 'use this config file'),
+- False, False, '/etc/bcfg2.conf', False),
++ False, False, '/usr/local/etc/bcfg2.conf', False),
+ 'client': (('-c', '<client>', 'hard set the client name (for debugging)'),
+ False, False, False, False)
+ }
+Index: src/sbin/StatReports
+===================================================================
+--- src/sbin/StatReports (revision 1954)
++++ src/sbin/StatReports (working copy)
+@@ -147,12 +147,12 @@
+
+ if __name__ == '__main__':
+ c = ConfigParser()
+- c.read(['/etc/bcfg2.conf'])
++ c.read(['/usr/local/etc/bcfg2.conf'])
+ configpath = "%s/etc/report-configuration.xml" % c.get('server', 'repository')
+ statpath = "%s/etc/statistics.xml" % c.get('server', 'repository')
+ clientsdatapath = "%s/Metadata/clients.xml" % c.get('server', 'repository')
+- transformpath = "/usr/share/bcfg2/xsl-transforms/"
+- #websrcspath = "/usr/share/bcfg2/web-rprt-srcs/"
++ transformpath = "/usr/local/share/bcfg2/xsl-transforms/"
++ #websrcspath = "/usr/local/share/bcfg2/web-rprt-srcs/"
+
+ try:
+ opts, args = getopt(argv[1:], "hc:s:", ["help", "config=", "stats="])
+Index: src/sbin/bcfg2-info
+===================================================================
+--- src/sbin/bcfg2-info (revision 1954)
++++ src/sbin/bcfg2-info (working copy)
+@@ -169,7 +169,7 @@
+ if '-c' in sys.argv:
+ cfile = sys.argv[-1]
+ else:
+- cfile = '/etc/bcfg2.conf'
++ cfile = '/usr/local/etc/bcfg2.conf'
+ try:
+ bcore = Bcfg2.Server.Core.Core({}, cfile)
+ except Bcfg2.Server.Core.CoreInitError, msg:
+Index: src/sbin/bcfg2-repo-validate
+===================================================================
+--- src/sbin/bcfg2-repo-validate (revision 1954)
++++ src/sbin/bcfg2-repo-validate (working copy)
+@@ -11,11 +11,11 @@
+ verbose = True
+ sys.argv.remove('-v')
+ cf = ConfigParser.ConfigParser()
+- cf.read(['/etc/bcfg2.conf'])
++ cf.read(['/usr/local/etc/bcfg2.conf'])
+ try:
+ prefix = cf.get('server', 'prefix')
+ except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
+- prefix = '/usr'
++ prefix = '/usr/local'
+ if verbose:
+ print "Using installation prefix %s" % (prefix)
+ schemadir = "%s/share/bcfg2/schemas" % (prefix)