* Removed deprecated dhcpd.conf and nat.conf

* minor modifications like missing check of arguments


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

3 files changed, 0 insertions, 76 deletions

diff --git a/os-plugins/plugins/vmware/files/README b/os-plugins/plugins/vmware/files/README
index 3ff1d901..b5610485 100644
--- a/os-plugins/plugins/vmware/files/README
+++ b/os-plugins/plugins/vmware/files/README
@@ -12,13 +12,6 @@ Files
   the Virtual Machine (see nvram below). Currently used internal and
   shouldn't affect normal OpenSLX users. Data will be available on every
   OpenSLX Client.
-- dhcpd.conf
-  DHCP Configuration file, which will be copied to
-  /etc/vmware/vmnet8/dhcpd/
-  Needed if you want to use NAT
-- nat.conf
-  NAT Configuration file, which will be copied to
-  /etc/vmware/vmnet8/nat/
 - nvram.5.0
   This nvram supports a second Floppy drive. Helpfull if you want to
   get some data from linux to your Windows VirtualMachine (like
diff --git a/os-plugins/plugins/vmware/files/dhcpd.conf b/os-plugins/plugins/vmware/files/dhcpd.conf
deleted file mode 100644
index a9db38ad..00000000
--- a/os-plugins/plugins/vmware/files/dhcpd.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# should be autogenerated ...
-#
-# Configuration file for ISC 2.0b6pl1 vmnet-dhcpd operating on vmnet8.
-#
-# This file was automatically generated by the VMware configuration program.
-# If you modify it, it will be backed up the next time you run the
-# configuration program.
-#
-# We set domain-name-servers to make some DHCP clients happy
-# (dhclient as configued in SuSE, TurboLinux, etc.).
-# We also supply a domain name to make pump (Red Hat 6.x) happy.
-#
-allow unknown-clients;
-default-lease-time 1800;		# 30 minutes
-max-lease-time 7200;			# 2 hours
-
-subnet 192.168.100.0 netmask 255.255.255.0 {
-    range 192.168.100.100 192.168.100.101;
-    option broadcast-address 192.168.100.255;
-    option domain-name-servers 192.168.100.2;
-    option domain-name "localdomain";
-    option routers 192.168.100.2;
-}
diff --git a/os-plugins/plugins/vmware/files/nat.conf b/os-plugins/plugins/vmware/files/nat.conf
deleted file mode 100644
index 07d684f0..00000000
--- a/os-plugins/plugins/vmware/files/nat.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# Linux NAT configuration file
-[host]
-# NAT gateway address
-ip = 192.168.100.2
-netmask = 255.255.255.0
-# or ip = 172.16.184.2/24
-
-# enable configuration; disabled by default for security reasons
-#configport = 33445
-
-# VMnet device if not specified on command line
-device = /dev/vmnet8
-
-# Allow PORT/EPRT FTP commands (they need incoming TCP stream...)
-activeFTP = 1
-
-# Allows the source to have any OUI.  Turn this one if you change the OUI
-# in the MAC address of your virtual machines.
-#allowAnyOUI = 1
-
-[udp]
-# Timeout in seconds, 0 = no timeout, default = 60; real value might
-# be up to 100% longer
-timeout = 60
-
-[incomingtcp]
-# Use these with care - anyone can enter into your VM through these...
-
-# FTP (both active and passive FTP is always enabled)
-#      ftp localhost 8887
-#8887 = 172.16.184.128:21
-
-# WEB (make sure that if you are using named webhosting, names point to
-#     your host, not to guest... And if you are forwarding port other
-#     than 80 make sure that your server copes with mismatched port 
-#     number in Host: header)
-#      lynx http://localhost:8888
-#8888 = 172.16.184.128:80
-
-# SSH
-#      ssh -p 8889 root@localhost
-#8889 = 172.16.184.128:22
-
-[incomingudp]
-# UDP port forwarding example
-#6000 = 172.16.184.128:6001