diff -Naur vmware-distrib/payload/install/vmware-installer/vmis/core/env.py vmware-distrib-magellan/payload/install/vmware-installer/vmis/core/env.py
--- vmware-distrib/payload/install/vmware-installer/vmis/core/env.py	2010-01-23 06:00:45.000000000 +0100
+++ vmware-distrib-magellan/payload/install/vmware-installer/vmis/core/env.py	2010-04-25 20:00:51.000000000 +0200
@@ -305,6 +305,8 @@
    # Python will interpret 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)
 
    componentCoreVersion = component.coreVersion
    if component.name == 'vmware-installer': # XXX: HARDCODE - Fix this.
diff -Naur vmware-distrib/payload/install/vmware-installer/vmis/core/questions.py vmware-distrib-magellan/payload/install/vmware-installer/vmis/core/questions.py
--- vmware-distrib/payload/install/vmware-installer/vmis/core/questions.py	2010-01-23 06:00:45.000000000 +0100
+++ vmware-distrib-magellan/payload/install/vmware-installer/vmis/core/questions.py	2010-04-25 20:01:28.000000000 +0200
@@ -199,6 +199,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 vmware-distrib/payload/install/vmware-installer/vmis/__init__.py vmware-distrib-magellan/payload/install/vmware-installer/vmis/__init__.py
--- vmware-distrib/payload/install/vmware-installer/vmis/__init__.py	2010-01-23 06:00:46.000000000 +0100
+++ vmware-distrib-magellan/payload/install/vmware-installer/vmis/__init__.py	2010-04-25 20:01:58.000000000 +0200
@@ -20,7 +20,7 @@
 MAJOR_VERSION = VERSION_INFO[0]
 VMISPYVERSION = os.environ.get('VMISPYVERSION')
 
-CONFDIR = path(u'/etc/vmware-installer')
+CONFDIR = path(u'./vmware-confdir')
 DATABASE_PATH = CONFDIR/'database'
 
 # Database setting for use by the installer and its component.
diff -Naur vmware-distrib/payload/install/vmware-installer/vmis/ui/console.py vmware-distrib-magellan/payload/install/vmware-installer/vmis/ui/console.py
--- vmware-distrib/payload/install/vmware-installer/vmis/ui/console.py	2010-01-23 06:00:45.000000000 +0100
+++ vmware-distrib-magellan/payload/install/vmware-installer/vmis/ui/console.py	2010-04-25 20:04:51.000000000 +0200
@@ -202,7 +202,7 @@
       # If no pager is found, or cannot be found in
       # the path, default to 'more'.
       if not pager:
-         pager = 'more'
+         pager = 'less'
 
       # Append -E to less so it quits after the last line of
       # the EULA is displayed.
diff -Naur vmware-distrib/payload/install/vmware-installer/vmis/util/log.py vmware-distrib-magellan/payload/install/vmware-installer/vmis/util/log.py
--- vmware-distrib/payload/install/vmware-installer/vmis/util/log.py	2010-01-23 02:09:06.000000000 +0100
+++ vmware-distrib-magellan/payload/install/vmware-installer/vmis/util/log.py	2010-04-25 20:05:51.000000000 +0200
@@ -31,6 +31,8 @@
       # It's okay if it already exists
       pass
 
+LOG_FILE = './vmware-installer.log'
+
 if level <= logging.DEBUG:
    MAX_BYTES = 0
    BACKUP_COUNT = 0