[or-cvs] r20551: {projects} Try a new approach for rebuilding vmware-tools (in projects/misc-sysadmin: . kernel kernel/vmware)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-09-13 19:03:37 -0400 (Sun, 13 Sep 2009)
New Revision: 20551

Added:
   projects/misc-sysadmin/kernel/rc.local
Modified:
   projects/misc-sysadmin/00_CAPTAINS.LOG
   projects/misc-sysadmin/grsec-prep.sh
   projects/misc-sysadmin/kernel/vmware/vmware-tools
Log:

Try a new approach for rebuilding vmware-tools



Modified: projects/misc-sysadmin/00_CAPTAINS.LOG
===================================================================
--- projects/misc-sysadmin/00_CAPTAINS.LOG	2009-09-13 20:51:45 UTC (rev 20550)
+++ projects/misc-sysadmin/00_CAPTAINS.LOG	2009-09-13 23:03:37 UTC (rev 20551)
@@ -42,6 +42,7 @@
  - Reordered /etc/rc.d/init.d/vmware-tools to load before S10network
    - /sbin/chkconfig --level 3 vmware-tools on
  - rpm -e smbios-utils-python smbios-utils firmware-addon-dell
+ - Added vmware-tools rebuid to rc.local
 
 38.229.70.5
  - Installed httpd
@@ -70,6 +71,10 @@
    compatible with suexec.
  - Made shell of both gitweb and gitperl /sbin/nologin and disabled passwords
 
+38.229.70.14:
+ - Installed Grsec+SELinux Kernel as per above sections
+
 38.229.70.15
  - Installed Grsec+SELinux Kernel as per above sections
- - installed epkg (encap implementation)
+ - installed epkg from source (encap implementation)
+ - installed chpax from source

Modified: projects/misc-sysadmin/grsec-prep.sh
===================================================================
--- projects/misc-sysadmin/grsec-prep.sh	2009-09-13 20:51:45 UTC (rev 20550)
+++ projects/misc-sysadmin/grsec-prep.sh	2009-09-13 23:03:37 UTC (rev 20551)
@@ -10,8 +10,6 @@
 
 cp ~torproject/misc-sysadmin/kernel/selinux /etc/sysconfig/selinux
 cp ~torproject/misc-sysadmin/kernel/fstab /etc/fstab
-/usr/sbin/genhomedircon
-touch /.autorelabel
 cp ~torproject/misc-sysadmin/kernel/vmware/vmware-tools /etc/init.d/vmware-tools
 /sbin/chkconfig --level 3 vmware-tools on
 rpm -e smbios-utils-python smbios-utils firmware-addon-dell
@@ -25,6 +23,20 @@
 make modules_install && make install
 cp ~torproject/misc-sysadmin/kernel/initrd-2.6.29.6-grsec-fc-nrl2.img /boot/
 cp ~torproject/misc-sysadmin/kernel/grub.conf /etc/grub.conf
+cp ~torproject/misc-sysadmin/rc.local /etc/rc.d/rc.local
 
 # XXX: While we're at it, fix timeout on logout and put /sbin, /usr/sbin/ and
 # /usr/local/sbin in path
+
+echo "# Post reboot, you will need to run these commands:"
+echo 
+echo "/usr/sbin/genhomedircon"
+echo "/sbin/fixfiles relabel"
+echo
+echo "# And don't forget to turn selinux into enforceing mode and disable module loading:"
+echo
+echo "/sbin/setenforce 1"
+echo "/sbin/sysctl kernel.grsecurity.disable_modules = 1"
+echo "/sbin/sysctl kernel.grsecurity.grsec_lock = 1"
+echo
+

Added: projects/misc-sysadmin/kernel/rc.local
===================================================================
--- projects/misc-sysadmin/kernel/rc.local	                        (rev 0)
+++ projects/misc-sysadmin/kernel/rc.local	2009-09-13 23:03:37 UTC (rev 20551)
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# This script will be executed *after* all the other init scripts.
+# You can put your own initialization stuff in here if you don't
+# want to do the full Sys V style init stuff.
+
+touch /var/lock/subsys/local
+
+# Rebuild vmware-tools and restart the network
+
+/usr/bin/vmware-config-tools.pl --default
+/etc/init.d/vmware-tools start
+/etc/init.d/network stop
+/etc/init.d/network start
+
+
+# Control kernel print message
+echo 4 > /proc/sys/kernel/printk


Property changes on: projects/misc-sysadmin/kernel/rc.local
___________________________________________________________________
Added: svn:executable
   + *

Modified: projects/misc-sysadmin/kernel/vmware/vmware-tools
===================================================================
--- projects/misc-sysadmin/kernel/vmware/vmware-tools	2009-09-13 20:51:45 UTC (rev 20550)
+++ projects/misc-sysadmin/kernel/vmware/vmware-tools	2009-09-13 23:03:37 UTC (rev 20551)
@@ -839,7 +839,9 @@
             echo 'To (re-)configure it, invoke the following command: '
             echo "$vmdb_answer_BINDIR"'/vmware-config-tools.pl.'
             echo
-            ${vmdb_answer_BINDIR}/vmware-config-tools.pl --default
+            # XXX: why doesn't this work? maybe it calls back into us?
+            #${vmdb_answer_BINDIR}/vmware-config-tools.pl --default
+            return
          fi
 
          echo 'Starting VMware Tools services in the virtual machine:'