[PC-BSD Commits] r20214 - in pcbsd/branches/9.1: overlays/desktop-overlay/etc src-qt4/pc-firstbootgui

[svn at pcbsd.org]

Author: kris
Date: 2012-11-13 17:50:50 +0000 (Tue, 13 Nov 2012)
New Revision: 20214

Modified:
   pcbsd/branches/9.1/overlays/desktop-overlay/etc/rc
   pcbsd/branches/9.1/overlays/desktop-overlay/etc/rc.conf
   pcbsd/branches/9.1/src-qt4/pc-firstbootgui/firstboot.cpp
Log:

MFC fast-boot settings



Modified: pcbsd/branches/9.1/overlays/desktop-overlay/etc/rc
===================================================================
--- pcbsd/branches/9.1/overlays/desktop-overlay/etc/rc	2012-11-13 17:49:44 UTC (rev 20213)
+++ pcbsd/branches/9.1/overlays/desktop-overlay/etc/rc	2012-11-13 17:50:50 UTC (rev 20214)
@@ -102,6 +102,9 @@
   # List of rc.d scripts we will start before login
   preLoad="/etc/rc.d/hostname /etc/rc.d/random /etc/rc.d/adjkerntz /etc/rc.d/cleanvar /etc/rc.d/hostid /etc/rc.d/ldconfig /etc/rc.d/zfs /etc/rc.d/zvol /etc/rc.d/cleartmp $fastboot_earlyrc "
 
+  # Start loopback device
+  /etc/rc.d/netif start lo0
+
   # Run the early scripts now
   for i in $preLoad
   do
@@ -109,7 +112,7 @@
   done
 
   # Start the delayed services after the login is up
-  (sleep 20; /bin/sh /etc/rc.delay "$_rc_elem_done$preLoad")&
+  (sleep 5; nice /bin/sh /etc/rc.delay "$_rc_elem_done$preLoad")&
 else
   # Performing a normal startup
 

Modified: pcbsd/branches/9.1/overlays/desktop-overlay/etc/rc.conf
===================================================================
--- pcbsd/branches/9.1/overlays/desktop-overlay/etc/rc.conf	2012-11-13 17:49:44 UTC (rev 20213)
+++ pcbsd/branches/9.1/overlays/desktop-overlay/etc/rc.conf	2012-11-13 17:50:50 UTC (rev 20214)
@@ -75,7 +75,7 @@
 sdpd_enable="YES"
 
 # Load the following kernel modules
-kld_list="libiconv libmchain msdosfs_iconv if_bwn if_bwi bwi_v3_ucode bwn_v4_ucode runfw ng_ubt cuse4bsd sem ntfs ntfs_iconv udf udf_iconv ext2fs mmc mmcsd scd geom_uzip pefs xfs reiserfs smbfs fdescfs linsysfs iwn4965fw iwn1000fw iwn5000fw iwn5150fw iwn6000fw iwn6000g2afw iwn6000g2bfw iwn6050fw"
+kld_list="libiconv libmchain msdosfs_iconv if_bwn if_bwi bwi_v3_ucode bwn_v4_ucode runfw ng_ubt cuse4bsd sem ntfs ntfs_iconv udf udf_iconv ext2fs mmc mmcsd scd geom_uzip pefs xfs reiserfs smbfs fdescfs linsysfs iwn4965fw iwn1000fw iwn5000fw iwn5150fw iwn6000fw iwn6000g2afw iwn6000g2bfw iwn6050fw acpi_video"
 
 # Clean out temporary files.
 clear_tmp_enable="YES"
@@ -101,7 +101,7 @@
 
 # Enable fast-booting
 fastboot_enable="YES"
-fastboot_earlyrc="/etc/rc.d/netif /etc/rc.d/moused /etc/rc.d/dhclient /etc/rc.d/pf /etc/rc.d/routing /etc/rc.d/devd /usr/local/etc/rc.d/pefs /usr/local/etc/rc.d/dbus /usr/local/etc/rc.d/hald /usr/local/etc/rc.d/gdm"
+fastboot_earlyrc="/etc/rc.d/moused /usr/local/etc/rc.d/pefs /usr/local/etc/rc.d/dbus /usr/local/etc/rc.d/hald /usr/local/etc/rc.d/gdm"
 
 # Enable the Warden
 warden_enable="YES"

Modified: pcbsd/branches/9.1/src-qt4/pc-firstbootgui/firstboot.cpp
===================================================================
--- pcbsd/branches/9.1/src-qt4/pc-firstbootgui/firstboot.cpp	2012-11-13 17:49:44 UTC (rev 20213)
+++ pcbsd/branches/9.1/src-qt4/pc-firstbootgui/firstboot.cpp	2012-11-13 17:50:50 UTC (rev 20214)
@@ -48,15 +48,6 @@
     if (index != -1)
        comboBoxTimezone->setCurrentIndex(index);
 
-    if ( system("ifconfig wlan0") == 0 ) {
-      haveWifi = true;
-      QTimer::singleShot(500,this,SLOT(slotScanNetwork()));
-      connect(pushButtonRescan, SIGNAL(clicked()), this, SLOT(slotScanNetwork()));
-      connect(listWidgetWifi, SIGNAL(itemPressed(QListWidgetItem *)), this, SLOT(slotAddNewWifi()));
-    } else {
-      haveWifi = false;
-    }
-
     // Start on the first screen
     installStackWidget->setCurrentIndex(0);
     backButton->setVisible(false);
@@ -170,6 +161,19 @@
    if ( installStackWidget->currentIndex() == 2)
      slotCheckUser();
 
+   // Check if we have a wireless device
+   if ( installStackWidget->currentIndex() == 3) {
+     if ( system("ifconfig wlan0") == 0 ) {
+       haveWifi = true;
+       QTimer::singleShot(50,this,SLOT(slotScanNetwork()));
+       connect(pushButtonRescan, SIGNAL(clicked()), this, SLOT(slotScanNetwork()));
+       connect(listWidgetWifi, SIGNAL(itemPressed(QListWidgetItem *)), this, SLOT(slotAddNewWifi()));
+     } else {
+       haveWifi = false;
+     }
+   }
+
+   // If not doing a wireless connection
    if ( installStackWidget->currentIndex() == 3 && ! haveWifi) {
       installStackWidget->setCurrentIndex(5);
       // Save the settings