Dash:
[t2.git] / package / emulators / vmware / vmware-install.patch
blob86024afc49e589f0489dc49e0158bfb98743259a
1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
3 #
4 # T2 SDE: package/.../vmware/vmware-install.patch
5 # Copyright (C) 2008 The T2 SDE Project
6 #
7 # More information can be found in the files COPYING and README.
8 #
9 # This patch file is dual-licensed. It is available under the license the
10 # patched project is licensed under, as long as it is an OpenSource license
11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
12 # of the GNU General Public License as published by the Free Software
13 # Foundation; either version 2 of the License, or (at your option) any later
14 # version.
15 # --- T2-COPYRIGHT-NOTE-END ---
17 --- ./vmware-install.pl.orig 2008-08-09 00:26:54.000000000 +0200
18 +++ ./vmware-install.pl 2008-09-03 13:01:02.000000000 +0200
19 @@ -192,9 +192,10 @@
21 if (vmware_product() eq 'wgs' || vmware_product() eq 'ws' ||
22 vmware_product() eq 'tools-for-linux') {
23 - system(shell_string($gHelper{'depmod'}) . ' -a');
24 - my $kvers = direct_command(shell_string($gHelper{'uname'}) . ' -r');
25 - chomp($kvers);
27 + #system(shell_string($gHelper{'depmod'}) . ' -a');
28 + my $kvers = $ENV{KVER};
29 + print "Kernel Version: $kvers\n";
31 if (not open(MODULESDEP, "/lib/modules/$kvers/modules.dep")) {
32 error("Unable to open kernel module dependency file\n.");
33 @@ -1659,7 +1660,7 @@
34 undef %patch;
35 install_dir('./etc', $gRegistryDir, \%patch, 0x1);
37 - $rootdir = '/usr';
38 + $rootdir = '/opt/vmware';
40 $answer = spacechk_answer('In which directory do you want to install '
41 . 'the executable files?', 'dirpath',
42 @@ -2073,8 +2074,9 @@
43 } elsif (vmware_product() eq 'tools-for-solaris') {
44 $rootdir = '/usr';
45 } else {
46 - $rootdir = '/usr';
47 + $rootdir = '/opt/vmware';
49 + $rootdir = '/opt/vmware';
50 $answer = spacechk_answer('In which directory do you want to '
51 . 'install the binary files?', 'dirpath',
52 $rootdir . '/bin', './bin', 'BINDIR');
53 @@ -2263,7 +2265,7 @@
54 undef %patch;
55 install_dir('./etc', $gRegistryDir, \%patch, 0x1);
57 - $rootdir = '/usr';
58 + $rootdir = '/opt/vmware';
60 $answer = spacechk_answer('In which directory do you want to '
61 . 'install the binary files?', 'dirpath',
62 @@ -2377,7 +2379,7 @@
63 undef %patch;
64 install_dir('./etc', $gRegistryDir, \%patch, 0x1);
66 - $rootdir = '/usr';
67 + $rootdir = '/opt/vmware';
68 $answer = spacechk_answer('In which directory do you want to '
69 . 'install the binary files?', 'dirpath',
70 $rootdir . './bin', './bin', 'BINDIR');
71 @@ -2623,7 +2625,7 @@
72 undef %patch;
73 install_dir('./etc', $gRegistryDir, \%patch, 0x1);
75 - $rootdir = '/usr';
76 + $rootdir = '/opt/vmware';
78 $answer = spacechk_answer('In which directory do you want '
79 . 'to install the binary files?', 'dirpath',
80 @@ -2721,7 +2723,7 @@
81 my %patch;
82 install_dir('./system_etc', '/etc', \%patch, 1);
83 undef %patch;
84 - install_dir('./usr', '/usr', \%patch, 1);
85 + install_dir('./usr', '/opt/vmware', \%patch, 1);
88 sub get_initscriptsdir {
89 @@ -3002,7 +3004,7 @@
93 - $rootdir = '/usr';
94 + $rootdir = '/opt/vmware';
95 $answer = spacechk_answer('In which directory do you want '
96 . 'to install the ' . vmware_product_name()
97 . ' binary files?', 'dirpath',
98 @@ -4203,7 +4205,8 @@
99 # Force the path to reduce the risk of using "modified" external helpers
100 # If the user has a special system setup, he will will prompted for the
101 # proper location anyway
102 - $ENV{'PATH'} = '/bin:/usr/bin:/sbin:/usr/sbin';
103 + # --- removed for SDE
104 + # $ENV{'PATH'} = '/bin:/usr/bin:/sbin:/usr/sbin';
106 initialize_globals(internal_dirname($0));
107 initialize_external_helpers();
108 @@ -4241,7 +4244,7 @@
109 db_load();
112 - my @modules = non_vmware_modules_installed();
113 + my @modules = (); #non_vmware_modules_installed();
114 if (scalar(@modules) > 0) {
115 error("The following VMware kernel modules have been found on your system that " .
116 "were not installed by the VMware Installer. Please remove them then run " .
117 @@ -4417,6 +4420,7 @@
118 . 'want this program to invoke the '
119 . 'command for you now?'
120 , 'RUN_CONFIGURATOR', 'yesno', 'yes');
121 + $answer = 'no';
122 } else {
123 if (vmware_product() ne 'vix') {
124 print wrap('Before running ' . vmware_product_name() . ' for the '