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

[svn at pcbsd.org]

Author: kris
Date: 2010-09-08 07:47:19 -0700 (Wed, 08 Sep 2010)
New Revision: 7528

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

Fixed install config to run some copy commands only after doing the package installations



Modified: pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp	2010-09-08 14:05:17 UTC (rev 7527)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp	2010-09-08 14:47:19 UTC (rev 7528)
@@ -570,8 +570,6 @@
       else
         tmpList << "packageType=uzip";
 
-      tmpList << "runCommand=cp /usr/local/share/pcbsd/xorg-gui/conf/ttys.xsetup /etc/ttys";
-      tmpList << "runExtCommand=cp /etc/X11/xorg.conf ${FSMNT}/usr/local/share/pcbsd/xorg-gui/conf/xorg.conf.basic";
       summaryList << tr("Performing a system upgrade of PC-BSD on:") + " /dev/" + upDrive;
     } else {
       tmpList << "installType=FreeBSD";
@@ -591,10 +589,6 @@
         tmpList << "packageType=uzip";
 
       tmpList << "";
-      tmpList << "# Doing PC-BSD Install make sure to start xorg-gui at first boot";
-      tmpList << "runCommand=cp /usr/local/share/xorg-gui/conf/ttys.xsetup /etc/ttys";
-      tmpList << "runCommand=sh /usr/PCBSD/Scripts/reset-firewall";
-      tmpList << "runExtCommand=cp /etc/X11/xorg.conf ${FSMNT}/usr/local/share/xorg-gui/conf/xorg.conf.basic";
       summaryList << tr("Performing a fresh install of PC-BSD");
     } else {
       tmpList << "installType=FreeBSD";
@@ -723,6 +717,15 @@
   if ( availPackageData )
     cfgList+=getDeskPkgCfg(summaryList);
 
+  // If this is a PC-BSD Install, do a few extra commands after everything else
+  if ( radioInstallPCBSD->isChecked() ) {
+      cfgList << "runCommand=cp /usr/local/share/xorg-gui/conf/ttys.xsetup /etc/ttys";
+      cfgList << "runExtCommand=cp /etc/X11/xorg.conf ${FSMNT}/usr/local/share/xorg-gui/conf/xorg.conf.basic";
+      if (! radioUpgrade->isChecked() )
+      	cfgList << "runCommand=sh /usr/PCBSD/Scripts/reset-firewall";
+  }
+
+
   textEditSummary->clear();
 
   // Now write out the cfgList to file