app-emulation/vmware-server: delete old files
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/vmware@1737 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
@@ -1,32 +0,0 @@
|
||||
diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl
|
||||
--- vmware-server-distrib.orig/bin/vmware-config.pl 2007-12-02 11:40:41.000000000 +0000
|
||||
+++ vmware-server-distrib/bin/vmware-config.pl 2007-12-02 11:43:29.000000000 +0000
|
||||
@@ -10162,7 +10162,7 @@
|
||||
error('Please shut down any running VMs and run this script again.' .
|
||||
"\n\n");
|
||||
} else {
|
||||
- if (system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware')
|
||||
+ if (system(shell_string('/etc/init.d' . '/vmware')
|
||||
. ' stop')) {
|
||||
error('Unable to stop services for ' . vmware_product_name() . "\n\n");
|
||||
}
|
||||
@@ -10212,8 +10212,8 @@
|
||||
|
||||
if (isDesktopProduct()) {
|
||||
build_vmblock();
|
||||
- createMimePackageFile();
|
||||
- configureDesktopFiles();
|
||||
+ # createMimePackageFile();
|
||||
+ # configureDesktopFiles();
|
||||
if (vmware_binary() ne "vmplayer") {
|
||||
configure_eclipse_plugin();
|
||||
}
|
||||
@@ -10283,7 +10283,7 @@
|
||||
db_save();
|
||||
# Then start VMware's services
|
||||
if (!$gOption{'skip-stop-start'}) {
|
||||
- system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start');
|
||||
+ system(shell_string('/etc/init.d' . '/vmware') . ' start');
|
||||
print "\n";
|
||||
}
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl
|
||||
--- vmware-server-distrib.orig/bin/vmware-config.pl 2007-12-02 11:16:42.000000000 +0000
|
||||
+++ vmware-server-distrib/bin/vmware-config.pl 2007-12-02 11:25:36.000000000 +0000
|
||||
@@ -9097,7 +9097,10 @@
|
||||
error('Unable to write configuration file "' . $name . '".' . "\n\n");
|
||||
}
|
||||
db_add_file($name, $cFlagTimestamp | $cFlagConfig);
|
||||
- safe_chmod(0644, $name);
|
||||
+ safe_chmod(0664, $name);
|
||||
+ my $gid = (getgrnam('vmware'))[2];
|
||||
+ my $uid = (stat($name))[4];
|
||||
+ safe_chown($uid,$gid,$name);
|
||||
|
||||
# Append the promotional configuration if it exists
|
||||
$promoconfig = $libdir . '/configurator/PROMOCONFIG';
|
||||
@@ -1,15 +0,0 @@
|
||||
diff -ur vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
|
||||
--- vmware-distrib.orig/bin/vmware-config.pl 2006-03-24 23:13:05.000000000 +0100
|
||||
+++ vmware-distrib/bin/vmware-config.pl 2006-03-24 23:26:40.000000000 +0100
|
||||
@@ -2015,9 +2015,9 @@
|
||||
. shell_string($pattern));
|
||||
chomp($header_page_offset);
|
||||
# Ignore PAGE_OFFSET if we cannot parse it.
|
||||
- if ($header_page_offset =~ /^$pattern \(?0x([0-9a-fA-F]{8,})/) {
|
||||
+ if ($header_page_offset =~ /^$pattern \(?(\([^)]*\))?\)?0x([0-9a-fA-F]{8,}).*$/) {
|
||||
# We found a valid page offset
|
||||
- $header_page_offset = $1;
|
||||
+ $header_page_offset = $2;
|
||||
if (defined($gSystem{'page_offset'}) and
|
||||
not (lc($header_page_offset) eq lc($gSystem{'page_offset'}))) {
|
||||
if ($source eq 'user') {
|
||||
@@ -1,26 +0,0 @@
|
||||
diff --git a/bin/vmware-config.pl b/bin/vmware-config.pl
|
||||
index 363f9cb..7ffc212 100755
|
||||
--- a/bin/vmware-config.pl
|
||||
+++ b/bin/vmware-config.pl
|
||||
@@ -10404,16 +10404,16 @@ sub main {
|
||||
}
|
||||
|
||||
if (vmware_product() ne 'server') {
|
||||
- configure_mon();
|
||||
- configure_vmci();
|
||||
- configure_vsock();
|
||||
- configure_pp();
|
||||
+ #configure_mon();
|
||||
+ #configure_vmci();
|
||||
+ #configure_vsock();
|
||||
+ #configure_pp();
|
||||
|
||||
if (vmware_product() eq 'wgs') {
|
||||
configure_net();
|
||||
}
|
||||
|
||||
- build_vmnet();
|
||||
+ #build_vmnet();
|
||||
}
|
||||
|
||||
if (isDesktopProduct()) {
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/installer/services.sh b/installer/services.sh
|
||||
index 402ad79..2fb53ab 100755
|
||||
--- a/installer/services.sh
|
||||
+++ b/installer/services.sh
|
||||
@@ -755,7 +755,7 @@ vmware_run_vimsh_cmd() {
|
||||
}
|
||||
|
||||
vmware_load_module() {
|
||||
- /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1
|
||||
+ /sbin/modprobe -s "$1" || exit 1
|
||||
return 0
|
||||
}
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
diff -uNr vmware-server-distrib.orig/installer/services.sh vmware-server-distrib/installer/services.sh
|
||||
--- vmware-server-distrib.orig/installer/services.sh 2007-12-02 12:08:09.000000000 +0000
|
||||
+++ vmware-server-distrib/installer/services.sh 2007-12-02 12:12:08.000000000 +0000
|
||||
@@ -823,8 +823,13 @@
|
||||
check_configured() {
|
||||
if [ -e "$vmware_etc_dir"/not_configured ]; then
|
||||
echo "`vmware_product_name`"' is installed, but it has not been (correctly) configured'
|
||||
- echo 'for the running kernel. To (re-)configure it, invoke the'
|
||||
- echo 'following command: '"$vmdb_answer_BINDIR"'/vmware-config.pl.'
|
||||
+ echo 'for the running kernel.'
|
||||
+ echo
|
||||
+ echo 'Please ensure that the modules have been compiled for this kernel:'
|
||||
+ echo ' emerge --oneshot vmware-modules'
|
||||
+ echo
|
||||
+ echo 'Also ensure '"`vmware_product_name`"' has been configured:'
|
||||
+ echo ' '"$vmdb_answer_BINDIR"'/vmware-config.pl.'
|
||||
echo
|
||||
|
||||
exit 1
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/bin/vmware-config.pl b/bin/vmware-config.pl
|
||||
index bb9d04f..458a14b 100755
|
||||
--- a/bin/vmware-config.pl
|
||||
+++ b/bin/vmware-config.pl
|
||||
@@ -10315,7 +10315,7 @@ sub main {
|
||||
|
||||
if ($gOption{'tools-switch'} == 0) {
|
||||
my @modules = non_vmware_modules_installed();
|
||||
- if (scalar(@modules) > 0) {
|
||||
+ if (scalar(@modules) < 0) {
|
||||
my $osVersion = direct_command(shell_string($gHelper{'uname'}) . ' -r');
|
||||
chomp($osVersion);
|
||||
error("The following VMware kernel modules have been found on your " .
|
||||
@@ -1,25 +0,0 @@
|
||||
--- bin.old/vmware-config.pl 2009-07-02 17:56:08.873568674 -0400
|
||||
+++ bin/vmware-config.pl 2009-07-02 17:56:59.000000000 -0400
|
||||
@@ -1341,6 +1341,14 @@
|
||||
}
|
||||
}
|
||||
|
||||
+ # Try using Genoot's rc-config
|
||||
+ if ($gHelper{'rc-config'} ne '') {
|
||||
+ if(0 == system(shell_string($gHelper{'rc-config'}) . ' add '
|
||||
+ . $service . ' default')) {
|
||||
+ return;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
# Set up vmware to start/stop at run levels 2, 3 and 5
|
||||
link_runlevel(2, $service, $S_level, $K_level);
|
||||
link_runlevel(3, $service, $S_level, $K_level);
|
||||
@@ -2552,6 +2560,7 @@
|
||||
}
|
||||
$gHelper{'insserv'} = internal_which('insserv');
|
||||
$gHelper{'chkconfig'} = internal_which('/sbin/chkconfig');
|
||||
+ $gHelper{'rc-config'} = internal_which('/usr/bin/rc-config');
|
||||
if (vmware_product() eq 'server' &&
|
||||
$gHelper{'chkconfig'} eq '') {
|
||||
error('No initscript installer found.' . "\n\n");
|
||||
Reference in New Issue
Block a user