91fc009f40
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/vmware@2787 6952d904-891a-0410-993b-d76249ca496b
62 lines
2.9 KiB
Diff
62 lines
2.9 KiB
Diff
diff -uNr 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-12-24 20:55:30.507661355 +0100
|
|
+++ b/payload/install/vmware-installer/vmis/core/env.py 2009-12-24 20:58:15.135415801 +0100
|
|
@@ -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('WORKDIR', './'), 'module_patcher.sh'), pathName)[1],
|
|
+ fileObj = file(pathName)
|
|
|
|
componentCoreVersion = component.coreVersion
|
|
if component.name == 'vmware-installer': # XXX: HARDCODE - Fix this.
|
|
diff -uNr 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-12-24 20:55:30.507661355 +0100
|
|
+++ b/payload/install/vmware-installer/vmis/core/questions.py 2009-12-24 20:58:15.135415801 +0100
|
|
@@ -199,6 +199,9 @@
|
|
"""
|
|
super(InitDir, self).Validate(answer)
|
|
|
|
+ ### 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 -uNr 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-12-24 20:55:30.506662004 +0100
|
|
+++ b/payload/install/vmware-installer/vmis/__init__.py 2009-12-24 20:59:50.810416210 +0100
|
|
@@ -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 -uNr 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-12-24 20:55:30.509662503 +0100
|
|
+++ b/payload/install/vmware-installer/vmis/ui/console.py 2009-12-24 21:01:53.076664336 +0100
|
|
@@ -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 -uNr 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-12-24 20:55:30.509662503 +0100
|
|
+++ b/payload/install/vmware-installer/vmis/util/log.py 2009-12-24 20:58:15.136416130 +0100
|
|
@@ -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
|