[PC-BSD Commits] r13391 - pcbsd/current/src-qt4/pc-sysinstaller

[svn at pcbsd.org]

Author: kris
Date: 2011-10-17 07:29:12 -0700 (Mon, 17 Oct 2011)
New Revision: 13391

Modified:
   pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp
Log:

Enable AUTO-DHCP-SLAAC for pc-sysinstall, which turns on DHCP / SLAAC for
IPv4 & IPv6 connectivity



Modified: pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp	2011-10-17 14:18:46 UTC (rev 13390)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp	2011-10-17 14:29:12 UTC (rev 13391)
@@ -192,6 +192,7 @@
   // load drives
   QString tmp;
   comboSelectNic->clear();
+  comboSelectNic->addItem("AUTO-DHCP-SLAAC");
   comboSelectNic->addItem("AUTO-DHCP");
   comboSelectNic->addItem("IPv6-SLAAC");
   QStringList sysNics = Scripts::Backend::networkDevices();
@@ -509,7 +510,7 @@
     lineIPv6->setEnabled(false);
     lineIPv6DefaultRouter->setEnabled(false);
     lineIPv6DNS->setEnabled(false);
-  } else if ( comboSelectNic->currentText() == "IPv6-SLAAC" ) {
+  } else if ( comboSelectNic->currentText() == "IPv6-SLAAC" || comboSelectNic->currentText() == "AUTO-DHCP-SLAAC" ) {
     lineIP->setEnabled(false);
     lineNetmask->setEnabled(false);
     lineDNS->setEnabled(false);
@@ -578,7 +579,14 @@
     tmp = comboSelectNic->currentText();
     if ( comboSelectNic->currentText() == "AUTO-DHCP" )
       tmpList << "netDev=AUTO-DHCP";
-    else if ( comboSelectNic->currentText() == "IPv6-SLAAC" ) {
+    else if ( comboSelectNic->currentText() == "AUTO-DHCP-SLAAC" ) {
+      tmpList << "netDev=AUTO-DHCP-SLAAC";
+      // We cannot rely on SLAAC to provide DNS for example.  The same is true
+      // for DHCP but the worls seems to have forgotten...
+      tmpList << "netIPv6=" + lineIPv6->text();
+      tmpList << "netIPv6NameServer=" + lineIPv6DNS->text();
+      tmpList << "netIPv6DefaultRouter=" + lineIPv6DefaultRouter->text();
+    } else if ( comboSelectNic->currentText() == "IPv6-SLAAC" ) {
       tmpList << "netDev=IPv6-SLAAC";
       // We cannot rely on SLAAC to provide DNS for example.  The same is true
       // for DHCP but the worls seems to have forgotten...
@@ -605,6 +613,12 @@
       tmp = comboSelectNic->currentText();
       if ( comboSelectNic->currentText() == "AUTO-DHCP" )
         tmpList << "netSaveDev=AUTO-DHCP";
+      else if ( comboSelectNic->currentText() == "AUTO-DHCP-SLAAC" ) {
+        tmpList << "netSaveDev=AUTO-DHCP-SLAAC";
+        tmpList << "netSaveIPv6=" + lineIPv6->text();
+        tmpList << "netSaveIPv6NameServer=" + lineIPv6DNS->text();
+        tmpList << "netSaveIPv6DefaultRouter=" + lineIPv6DefaultRouter->text();
+      }
       else if ( comboSelectNic->currentText() == "IPv6-SLAAC" ) {
         tmpList << "netSaveDev=IPv6-SLAAC";
         tmpList << "netSaveIPv6=" + lineIPv6->text();
@@ -629,10 +643,9 @@
     // Doing a regular DVD/USB install
     tmpList << "installMedium=dvd";
 
-    // Doing PC-BSD install, setup DHCP on all nics
+    // Doing PC-BSD install, setup DHCP/SLAAC on all nics
     if ( radioInstallPCBSD->isChecked() ) {
-      tmpList << "netSaveDev=AUTO-DHCP";
-      //XXX IPv6 SLAAC?
+      tmpList << "netSaveDev=AUTO-DHCP-SLAAC";
     }
 
     summaryList << tr("Installing From:") + " " + tr("DVD/USB");