[PC-BSD Commits] r7742 - in pcbsd/current: src-qt4/pc-netmanager/src/NetworkManager system-overlay/etc

[svn at pcbsd.org]

Author: kris
Date: 2010-10-08 01:39:28 -0700 (Fri, 08 Oct 2010)
New Revision: 7742

Modified:
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp
   pcbsd/current/system-overlay/etc/rc.conf
Log:

Move from ipv6_enable -> ipv6_activate_all_interfaces for HEAD



Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp	2010-10-07 16:41:37 UTC (rev 7741)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp	2010-10-08 08:39:28 UTC (rev 7742)
@@ -644,7 +644,7 @@
 
     // Check for IPv6 settings
     lineIPv6Gateway->setText(getValue("/etc/rc.conf", "ipv6_defaultrouter=", 1) );
-    tmp = getValue("/etc/rc.conf", "ipv6_enable=", 1) ;
+    tmp = getValue("/etc/rc.conf", "ipv6_activate_all_interfaces=", 1) ;
     if ( tmp == "YES" )
         groupIPv6->setChecked(TRUE);
     else
@@ -1153,10 +1153,10 @@
    
    // Save the IPv6 stuff
     if ( groupIPv6->isChecked() ) {
-	saveValue("/etc/rc.conf", "ipv6_enable=", "ipv6_enable=\"YES\"", -1);
+	saveValue("/etc/rc.conf", "ipv6_activate_all_interfaces=", "ipv6_activate_all_interfaces=\"YES\"", -1);
 	saveValue("/etc/rc.conf", "ipv6_defaultrouter=", "ipv6_defaultrouter=\"" + lineIPv6Gateway->text() + "\"", -1);
     } else {
-	saveValue("/etc/rc.conf", "ipv6_enable=", "", -1);
+	saveValue("/etc/rc.conf", "ipv6_activate_all_interfaces=", "", -1);
 	saveValue("/etc/rc.conf", "ipv6_defaultrouter=", "", -1);
     }
 

Modified: pcbsd/current/system-overlay/etc/rc.conf
===================================================================
--- pcbsd/current/system-overlay/etc/rc.conf	2010-10-07 16:41:37 UTC (rev 7741)
+++ pcbsd/current/system-overlay/etc/rc.conf	2010-10-08 08:39:28 UTC (rev 7742)
@@ -64,7 +64,7 @@
 swapmonitor_enable="YES"
 
 # Enable IPV6 support
-ipv6_enable="YES"
+ipv6_activate_all_interfaces="YES"
 
 # Enable BSDStats
 bsdstats_enable="YES"