Some hints for distro specific stuff within the runlevel script to

be generated ...


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

2 files changed, 31 insertions, 14 deletions

diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
index 2da0d688..92107519 100644
--- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
@@ -215,13 +215,13 @@ sub removalPhase
     my $pluginTempPath       = shift;
     
     rmtree ( [ $pluginRepositoryPath ] );
-    # restore old start scripts
-    my @files = qw( vmware vmplayer );
-    foreach my $file (@files) {
-        rename ("/usr/bin/$file.slx-bak", "/usr/bin/$file");
-    }
+    # restore old start scripts - to be discussed
+    #my @files = qw( vmware vmplayer );
+    #foreach my $file (@files) {
+    #    rename ("/usr/bin/$file.slx-bak", "/usr/bin/$file");
+    #}
     # TODO: path is distro specific
-    rename ("/etc/init.d/vmware.slx-bak", "/etc/init.d/vmware");
+    #rename ("/etc/init.d/vmware.slx-bak", "/etc/init.d/vmware");
     return;
 }
 
@@ -307,31 +307,47 @@ sub _writeRunlevelScript
           fi
         }
         
-        case $1 in
+        # Ubuntu
+        # . /lib/lsb/init-functions
+        # SuSE
+        # . /etc/rc.status
+        # rc_reset
+        case \$1 in
           start)
-            # message output should match the given vendor-os
-            echo "Starting vmware background services ..."
+            # SuSE
+            echo -n "Starting vmware background services ..."
+            # Ubuntu
+            # log_begin_msg "Starting vmware background services ..."
             load_modules
             setup_vmnet0
             setup_vmnet1
             setup_vmnet8
             runvmdhcpd
+            # message output should match the given vendor-os
+            # Ubuntu ####
+            # log_warning_msg "Not starting because of something ...
+            # SuSE ####
+            # rc_status -v
           ;;
           stop)
             # message output should match the given vendor-os
-            echo "Stopping vmware background services ..."
+            echo -n "Stopping vmware background services ..."
             killall vmnet-netifup vmnet-natd vmnet-bridge vmware vmplayer \
               vmware-tray 2>/dev/null
             # wait for shutting down of interfaces
             usleep 50000
             unload_modules
+            # SuSE
+            # rc_status -v
           ;;
           status)
             echo "Say something useful here ..."
           ;;
         esac
-        
+        # Ubuntu
         exit 0
+        # SuSE (10.2)
+        # rc_exit
     End-of-Here
 
     # OLTA: this backup strategy is useless if invoked twice, so I have
diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh
index 00ee4bfd..af676efb 100644
--- a/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/os-plugins/plugins/vmware/XX_vmware.sh
@@ -55,7 +55,7 @@ stage3 setup" > /mnt/etc/vmware/slxvmconfig
       # use the dns servers know to the vmware host
       # TODO: to be checked!!
       local dnslist=$(echo "$domain_name_servers"|sed "s/ /,/g")
-      echo "# /etc/vmware/dhcpd.conf written in stage3 ...\nallow \
+      echo -e "# /etc/vmware/dhcpd.conf written in stage3 ...\nallow \
 unknown-clients;\ndefault-lease-time 1800;\nmax-lease-time 7200;\n\
 option domain-name-servers $dnslist;\noption domain-name \"vm.local\";" \
         > /mnt/etc/vmware/dhcpd.conf
@@ -66,9 +66,10 @@ option domain-name-servers $dnslist;\noption domain-name \"vm.local\";" \
       local vmnet1=${vmware_vmnet%,*}
       local vmip=${vmnet1%/*}
       local vmpx=${vmnet1#*/}
-      echo "vmnet1=$vmip/$vmpx" >> /mnt/etc/vmware/slxvmconfig
+      echo "$vmnt, $vmnet1, $vmip, $vmpx"
+      echo -e "vmnet1=$vmip/$vmpx" >> /mnt/etc/vmware/slxvmconfig
       [ -n "$vmnt" ] && echo "vmnet1nat=true" >> /mnt/etc/vmware/slxvmconfig
-      echo "subnet $(ipcalc -n $vmip/$vmpx|sed s/.*=//) netmask \
+      echo -e "subnet $(ipcalc -n $vmip/$vmpx|sed s/.*=//) netmask \
 $(ipcalc -n $vmip/$vmpx|sed s/.*=//) {\n\trange $rstart $rend;\n\
 \toption broadcast $(ipcalc -b $vmip/$vmpx|sed s/.*=//);\n\
 \toption routers $vmip;\n}" > /mnt/etc/vmware/dhcpd.conf