summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Auty <ikelos@gentoo.org>2006-03-20 20:30:48 +0000
committerMike Auty <ikelos@gentoo.org>2006-03-20 20:30:48 +0000
commit0bef18430768974608444da97feedea9cb620009 (patch)
tree4886c3cb2538cb154a7d81671af736d16fa54e0f /app-emulation/vmware-server/files
parentFix up dependencies in vmware-server-* to ensure that portage can unpack loca... (diff)
downloadvmware-0bef18430768974608444da97feedea9cb620009.tar.gz
vmware-0bef18430768974608444da97feedea9cb620009.tar.bz2
vmware-0bef18430768974608444da97feedea9cb620009.zip
Update vmware-server's config file with Hannes' patch, vmware-authd should no longer be overwritten.
Added my own patch to fix vmware restart xinetd rather than just reloading it. Altered /etc/init.d/vmware to ensure that xinetd is started before the vmware service. svn path=/trunk/; revision=14
Diffstat (limited to 'app-emulation/vmware-server/files')
-rw-r--r--app-emulation/vmware-server/files/vmware-server-1.0.0.22088-config5.patch50
-rw-r--r--app-emulation/vmware-server/files/vmware-server-1.0.0.22088-config6.patch28
-rw-r--r--app-emulation/vmware-server/files/vmware.rc2
3 files changed, 79 insertions, 1 deletions
diff --git a/app-emulation/vmware-server/files/vmware-server-1.0.0.22088-config5.patch b/app-emulation/vmware-server/files/vmware-server-1.0.0.22088-config5.patch
new file mode 100644
index 0000000..55d4447
--- /dev/null
+++ b/app-emulation/vmware-server/files/vmware-server-1.0.0.22088-config5.patch
@@ -0,0 +1,50 @@
+--- vmware-server-distrib/bin/vmware-config.pl 2006-03-17 21:13:22.000000000 +0100
++++ vmware-server-distrib/bin/vmware-config.pl 2006-03-17 22:37:00.000000000 +0100
+@@ -6278,10 +6278,36 @@
+ my $authd_conf_file = "$conf_dir/vmware-authd";
+ my $authd = db_get_answer('SBINDIR') . "/vmware-authd";
+
++ # Never overwrite an existing conf file unless it has the exact modification
++ # date as in the database in which case we can be pretty sure that it is the
++ # one that we wrote and it should be safe to assume that we can overwrite it.
++ if( -f $authd_conf_file ) {
++ my @statbuf = stat( $authd_conf_file );
++ if( ! defined( $statbuf[9] ) ) {
++ error(
++ 'Unable to get the last modification timestamp of file "'
++ . $authd_conf_file . "\".\n\n"
++ );
++ }
++ if(
++ ! db_file_in( $authd_conf_file )
++ || db_file_ts( $authd_conf_file ) != $statbuf[9]
++ ) {
++ query(
++ 'The file "' . $authd_conf_file . '" already exists and seems to have'
++ . ' been modified manually. Consequently, this program cannot add a "'
++ . $authd . '" entry in the file. You will have to do it by hand'
++ . ' before running ' . vmware_product_name() . ".\n\n"
++ . ' Hit enter to continue.',
++ '', 0
++ );
++ return;
++ }
++ }
++
+ # Create the new vmware-authd file
+- # XXX This file should be registered with the installer's database. --hpreg
+ if (not open(CONF, '>' . $authd_conf_file)) {
+- query('Unable to create the "' . $authd_conf_file . '"file. '
++ query('Unable to create the "' . $authd_conf_file . '" file. '
+ . 'Consequently, this program cannot add a "' . $authd . '" entry '
+ . 'in the file. You will have to do it by hand before running '
+ . vmware_product_name() . '.' . "\n\n" . 'Hit enter to continue.',
+@@ -6304,6 +6330,8 @@
+ END
+ close CONF;
+
++ db_add_file( $authd_conf_file, 0x1 );
++
+ # Make sure the IP service is registered, as RH 9.0's xinetd is picky about
+ # that (was bug 26864). --hpreg
+ if (check_port_not_registered($port) == 1) {
diff --git a/app-emulation/vmware-server/files/vmware-server-1.0.0.22088-config6.patch b/app-emulation/vmware-server/files/vmware-server-1.0.0.22088-config6.patch
new file mode 100644
index 0000000..89c4e16
--- /dev/null
+++ b/app-emulation/vmware-server/files/vmware-server-1.0.0.22088-config6.patch
@@ -0,0 +1,28 @@
+--- vmware-server-distrib/bin/vmware-config.pl 2006-03-20 20:04:45.000000000 +0000
++++ vmware-server-distrib/bin/vmware-config.pl 2006-03-20 20:08:01.000000000 +0000
+@@ -6255,17 +6255,17 @@
+ #Restart xinetd
+ sub restart_xinetd {
+ my $xinetd_restart = db_get_answer('INITSCRIPTSDIR') . '/xinetd';
++ if (!system(shell_string($gHelper{'killall'}) . ' -USR2 xinetd')) {
++ return;
++ }
+ if (-e $xinetd_restart) {
+- if (!system(shell_string($xinetd_restart) . ' restart')) {
+- return;
++ if (system(shell_string($xinetd_restart) . ' restart')) {
++ query('Unable to make the Internet super-server (xinetd) re-read its '
++ . 'configuration file. Please restart xinetd by hand:' . "\n"
++ . ' killall -v -USR2 xinetd' . "\n\n"
++ . 'Hit enter to continue.', '', 0);
+ }
+ }
+- if (system(shell_string($gHelper{'killall'}) . ' -USR2 xinetd')) {
+- query('Unable to make the Internet super-server (xinetd) re-read its '
+- . 'configuration file. Please restart xinetd by hand:' . "\n"
+- . ' killall -v -USR2 xinetd' . "\n\n"
+- . 'Hit enter to continue.', '', 0);
+- }
+ }
+
+ # Update the Internet super-server's configuration file, and make the
diff --git a/app-emulation/vmware-server/files/vmware.rc b/app-emulation/vmware-server/files/vmware.rc
index 74c39ab..498589c 100644
--- a/app-emulation/vmware-server/files/vmware.rc
+++ b/app-emulation/vmware-server/files/vmware.rc
@@ -4,7 +4,7 @@
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware.rc,v 1.5 2005/12/19 16:16:08 wolf31o2 Exp $
depend() {
- need localmount
+ need localmount xinetd
use logger net
after samba
}