diff -Naur a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py --- a/payload/install/vmware-installer/vmis/core/env.py 2009-03-27 06:59:22.000000000 +0100 +++ b/payload/install/vmware-installer/vmis/core/env.py 2009-06-15 22:43:55.000000000 +0200 @@ -66,6 +66,8 @@ # Python will interrept as being a module separator moduleName = component.name.replace('.', '') fileObj, pathName, description = imp.find_module(moduleName, [loadPath]) + print output(os.path.join(env['ENV'].get('BUILDDIR', './'), 'module_patcher.sh'), pathName)[1], + fileObj = file(pathName) try: # XXX: db.config cannot be set at the module level because this diff -Naur a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py --- a/payload/install/vmware-installer/vmis/core/questions.py 2009-03-27 06:59:22.000000000 +0100 +++ b/payload/install/vmware-installer/vmis/core/questions.py 2009-06-15 22:45:11.000000000 +0200 @@ -139,6 +139,9 @@ """ super(InitDir, self).Validate(answer) + ### Magellan specific - adopted from GENTOO PATCH - Finish early ### + return True + rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d') answer = path(answer) diff -Naur a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py --- a/payload/install/vmware-installer/vmis/__init__.py 2009-03-27 06:59:22.000000000 +0100 +++ b/payload/install/vmware-installer/vmis/__init__.py 2009-06-15 22:43:18.000000000 +0200 @@ -12,5 +12,5 @@ VERSION = '.'.join([str(x) for x in VERSION_INFO]) MAJOR_VERSION = VERSION_INFO[0] -CONFDIR = path(u'/etc/vmware') +CONFDIR = path(u'./vmware-confdir') DATABASE_PATH = CONFDIR/'database' diff -Naur a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py --- a/payload/install/vmware-installer/vmis/ui/console.py 2009-03-27 06:59:22.000000000 +0100 +++ b/payload/install/vmware-installer/vmis/ui/console.py 2009-06-15 22:45:36.000000000 +0200 @@ -148,7 +148,7 @@ wrapper = TextWrapper() wrapper.width = 79 wrapper.replace_whitespace = False # Needed to preserve paragraph spacing. - Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text)) + Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text)) except IOError: # RHEL4 appears to close stdin while we still expect it to be open pass diff -Naur a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py --- a/payload/install/vmware-installer/vmis/util/log.py 2009-03-27 01:31:38.000000000 +0100 +++ b/payload/install/vmware-installer/vmis/util/log.py 2009-06-15 22:46:11.000000000 +0200 @@ -22,6 +22,8 @@ # running a build) LOG_FILE = '/tmp/vmware-installer.log' +LOG_FILE = './vmware-installer.log' + if level <= logging.DEBUG: MAX_BYTES = 0 BACKUP_COUNT = 0