Cleanup, comments for vmware Plugin, see #240 too ... (renaming of the

runlevel script to vmware-env to avoid name overlaps for killall)


git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1929 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 12 insertions, 11 deletions

diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
index d758c002..bd790e45 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
@@ -53,6 +53,7 @@ sub fillRunlevelScript
 
         # helper functions
         load_modules() {
+          # shouldn't be in here (see ticket 240)
           if [ \${vmware_kind} = "local" ]; then
             # to be filled in via the stage1 configuration script
             modprobe -qa vmmon vmnet vmblock 2>/dev/null || return 1
@@ -62,6 +63,7 @@ sub fillRunlevelScript
             # load module manuall
             vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/
             module_src_path=\${vmware_kind_path}/vmroot/modules
+            # shouldn't be in here (see ticket 240)
             if [ \${vmware_kind} != "vmpl1.0" ]; then
               insmod \${module_src_path}/vmblock.ko
             fi
@@ -96,13 +98,14 @@ sub fillRunlevelScript
             ip link set vmnet1 up
             if [ -n "\$vmnet1nat" ] ; then
               # needs refinement interface name for eth0 is known in stage3 already
+              # available from \$nwif
               echo "1" > /proc/sys/net/ipv4/conf/vmnet1/forwarding 2>/dev/null
               echo "1" > /proc/sys/net/ipv4/conf/eth0/forwarding 2>/dev/null
               #iptables -A -s vmnet1 -d eth0
             fi
             $location/vmnet-dhcpd -cf /etc/vmware/dhcpd-vmnet1.conf \\
               -lf /var/run/vmware/dhcpd-vmnet1.leases \\
-              -pf /var/run/vmnet-dhcpd-vmnet1.pid vmnet1
+              -pf /var/run/vmnet-dhcpd-vmnet1.pid vmnet1 2>/dev/null # or logfile
           fi
         }
         # incomplete ...
@@ -117,10 +120,10 @@ sub fillRunlevelScript
             ip link set vmnet8 up
             # /etc/vmware/vmnet-natd-8.mac simply contains a mac like 00:50:56:F1:30:50
             $location/vmnet-natd -d /var/run/vmnet-natd-8.pid \\
-              -m /etc/vmware/vmnet-natd-8.mac -c /etc/vmware/nat.conf
+              -m /etc/vmware/vmnet-natd-8.mac -c /etc/vmware/nat.conf >/dev/null # or logfile
             $location/vmnet-dhcpd -cf /etc/vmware/dhcpd-vmnet8.conf \\
               -lf /var/run/vmware/dhcpd-vmnet8.leases \\
-              -pf /var/run/vmnet-dhcpd-vmnet8.pid vmnet8
+              -pf /var/run/vmnet-dhcpd-vmnet8.pid vmnet8 2>/dev/null # or logfile
           fi
         }
         # load the helper stuff
diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh
index 59a16919..570bdb5a 100644
--- a/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/os-plugins/plugins/vmware/XX_vmware.sh
@@ -29,10 +29,6 @@ if [ -e /initramfs/plugin-conf/vmware.conf ]; then
     [ $DEBUGLEVEL -gt 0 ] && echo "executing the 'vmware' os-plugin ...";
     # Load general configuration
     . /initramfs/machine-setup
-    # evtl. völlig unnötig?!?
-    #. /etc/functions
-    #. /etc/distro-functions
-    #. /etc/sysconfig/config
 
     # prepare all needed vmware configuration files
     if [ -d /mnt/etc/vmware ] ; then
@@ -48,6 +44,8 @@ if [ -e /initramfs/plugin-conf/vmware.conf ]; then
     # should contain (seems to be an average one)
     echo -e "# configuration file for vmware background services written in \
 stage3 setup" > /mnt/etc/vmware/slxvmconfig
+    # fixme: sollte unnötig sein, das hier zu tun. "vmware-env" kann hier voll
+    # determiniert werden, siehe Ticket 240
     echo "vmware_kind=${vmware_kind}" >> /mnt/etc/vmware/slxvmconfig
     if [ "$vmware_bridge" = 1 ] ; then
       echo "vmnet0=true" >> /mnt/etc/vmware/slxvmconfig
@@ -139,10 +137,10 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \
     fi
     # copy the runlevelscript to the proper place and activate it
     cp /mnt/opt/openslx/plugin-repo/vmware/${vmware_kind}/vmware.init \
-      /mnt/etc/${D_INITDIR}/vmware \
+      /mnt/etc/${D_INITDIR}/vmware-env \
       || echo "  * Error copying runlevel script. Shouldn't happen."
-    chmod a+x /mnt/etc/${D_INITDIR}/vmware
-    rllinker "vmware" 20 2
+    chmod a+x /mnt/etc/${D_INITDIR}/vmware-env
+    rllinker "vmware-env" 20 2
 
     #############################################################################
     # vmware stuff first part: two scenarios
@@ -189,7 +187,7 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \
     
     # create needed directories and files
     for i in /var/run/vmware /etc/vmware/loopimg \
-             /etc/vmware/fd-loop /var/X11R6/bin /etc/X11/sessions; do
+             /etc/vmware/fd-loop /var/X11R6/bin; do
       testmkd /mnt/$i
     done