Changeset 17991 in vbox

Timestamp:

Mar 17, 2009 1:06:01 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

44577

Message:

default Dhcp server settings for non-windows platforms

Location:

trunk/src/VBox/Main

Files:

• VirtualBoxImpl.cpp (modified) (1 diff)
• xml/SettingsConverter.xsl (modified) (1 diff)

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -94 +94 @@
     "    <NetserviceRegistry>"RTFILE_LINEFEED
     "       <DhcpServers>"RTFILE_LINEFEED
-    "          <DhcpServer networkName=\"HostInterfaceNetworking-VirtualBox Host-Only Network Adapter\" "
+    "          <DhcpServer "
+#ifdef RT_OS_WINDOWS
+                          "networkName=\"HostInterfaceNetworking-VirtualBox Host-Only Network Adapter\" "
+#else
+                          "networkName=\"HostInterfaceNetworking-vboxnet0\" "
+#endif
                           "IPAddress=\"192.168.56.2\" networkMask=\"255.255.255.0\" "
                           "lowerIP=\"192.168.56.3\" upperIP=\"192.168.56.255\" "

trunk/src/VBox/Main/xml/SettingsConverter.xsl

@@ -858 +858 @@
             <NetserviceRegistry>
            <DhcpServers>
-                <DhcpServer networkName="HostInterfaceNetworking-VirtualBox Host-Only Network Adapter" 
+              <xsl:choose>
+                <xsl:when test="substring-after(../@version,'-')='windows'">
+                       <DhcpServer networkName="HostInterfaceNetworking-VirtualBox Host-Only Network Adapter" 
                         IPAddress="192.168.56.2" networkMask="255.255.255.0"
                         lowerIP="192.168.56.3" upperIP="192.168.56.255"
                         enabled="1"/>
+                </xsl:when>
+                <xsl:otherwise>
+                       <DhcpServer networkName="HostInterfaceNetworking-vboxnet0" 
+                        IPAddress="192.168.56.2" networkMask="255.255.255.0"
+                        lowerIP="192.168.56.3" upperIP="192.168.56.255"
+                        enabled="1"/>
+                </xsl:otherwise>
+              </xsl:choose>
            </DhcpServers>
         </NetserviceRegistry>