[PC-BSD Commits] r17899 - pcbsd/current/src-qt4/pc-installgui

[svn at pcbsd.org]

Author: kris
Date: 2012-07-24 13:55:50 +0000 (Tue, 24 Jul 2012)
New Revision: 17899

Modified:
   pcbsd/current/src-qt4/pc-installgui/installer.cpp
   pcbsd/current/src-qt4/pc-installgui/wizardFreeBSD.cpp
   pcbsd/current/src-qt4/pc-installgui/wizardFreeBSD.h
Log:

Add /bin/bash as a default shell choice for TrueOS users



Modified: pcbsd/current/src-qt4/pc-installgui/installer.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-07-24 13:53:11 UTC (rev 17898)
+++ pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-07-24 13:55:50 UTC (rev 17899)
@@ -723,9 +723,15 @@
 
    // Start the FreeBSD wizard
    if ( installStackWidget->currentIndex() == 1 && (wheelCurItem == wFREEBSD || wheelCurItem == wPCSERVER || wheelCurItem == 12) ) {
+     bool tOS;
+     if ( wheelCurItem == wPCSERVER || wheelCurItem == 12 )
+       tOS = true;
+     else
+       tOS = false;
+
      wFBSD = new wizardFreeBSD();
      wFBSD->setWindowModality(Qt::ApplicationModal);
-     wFBSD->programInit();
+     wFBSD->programInit(tOS);
      connect(wFBSD, SIGNAL(saved(QString, QString, QString, QString, QString, QString, bool, bool, bool, QStringList)), this, SLOT(slotSaveFBSDSettings(QString, QString, QString, QString, QString, QString, bool, bool, bool, QStringList)));
      wFBSD->show();
      wFBSD->raise();

Modified: pcbsd/current/src-qt4/pc-installgui/wizardFreeBSD.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/wizardFreeBSD.cpp	2012-07-24 13:53:11 UTC (rev 17898)
+++ pcbsd/current/src-qt4/pc-installgui/wizardFreeBSD.cpp	2012-07-24 13:55:50 UTC (rev 17899)
@@ -13,7 +13,7 @@
 #include "ui_wizardFreeBSD.h"
 #include "backend.h"
 
-void wizardFreeBSD::programInit()
+void wizardFreeBSD::programInit(bool trueOS)
 {
    connect(this,SIGNAL(currentIdChanged(int)),this,SLOT(slotCheckComplete()));
    connect(lineRootPW,SIGNAL(textChanged(const QString)),this,SLOT(slotCheckComplete()));
@@ -39,6 +39,11 @@
    } 
    connect(comboSelectNic,SIGNAL(currentIndexChanged(int)), this, SLOT(slotChangedNic()));
    slotChangedNic();
+
+
+   if ( trueOS ) {
+      comboShell->addItem("/bin/bash");
+   }
 }
 
 void wizardFreeBSD::slotChangedNic()

Modified: pcbsd/current/src-qt4/pc-installgui/wizardFreeBSD.h
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/wizardFreeBSD.h	2012-07-24 13:53:11 UTC (rev 17898)
+++ pcbsd/current/src-qt4/pc-installgui/wizardFreeBSD.h	2012-07-24 13:55:50 UTC (rev 17899)
@@ -14,7 +14,7 @@
         {
           setupUi(this);
         }
-    void programInit();
+    void programInit(bool);
 
 public slots: