diff options
| author | Dirk von Suchodoletz | 2008-07-13 16:06:42 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2008-07-13 16:06:42 +0200 |
| commit | a137a69c8b76dbfd2cdf6639d1bb133ebffaffa3 (patch) | |
| tree | 7824033978e4ecf769e3670f1b7ef0417b35293b /os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm | |
| parent | * fixed path (diff) | |
| download | core-a137a69c8b76dbfd2cdf6639d1bb133ebffaffa3.tar.gz core-a137a69c8b76dbfd2cdf6639d1bb133ebffaffa3.tar.xz core-a137a69c8b76dbfd2cdf6639d1bb133ebffaffa3.zip | |
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
Diffstat (limited to 'os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm')
| -rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm | 9 |
1 files changed, 6 insertions, 3 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 |