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

[svn at pcbsd.org]

Author: kris
Date: 2013-01-31 19:18:49 +0000 (Thu, 31 Jan 2013)
New Revision: 21270

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

Change some of the install commands we call during pc-sysinstall setup



Modified: pcbsd/current/src-qt4/pc-installgui/installer.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/installer.cpp	2013-01-31 19:16:34 UTC (rev 21269)
+++ pcbsd/current/src-qt4/pc-installgui/installer.cpp	2013-01-31 19:18:49 UTC (rev 21270)
@@ -882,13 +882,9 @@
   if ( wheelCurItem != wPCSERVER && wheelCurItem != 12 && wheelCurItem != wFREEBSD ) {
     tmpList << "installType=PCBSD";
     tmpList << "packageType=dist";
-    distFiles+=" pcbsd";
   } else {
     tmpList << "installType=FreeBSD";
     tmpList << "packageType=dist";
-    // If we are doing TrueOS server or FreeBSD server
-    if ( wheelCurItem == wPCSERVER || wheelCurItem == 12 )
-       distFiles+=" trueos";
   }
 
   // Set the distFiles being used
@@ -1008,34 +1004,31 @@
     // First mount /dev inside chroot
     cfgList << "runExtCommand=mount -t devfs devfs ${FSMNT}/dev";
 
-    // Make sure the xsetup wizard starts at first boot
-    cfgList << "runCommand=touch /var/.runxsetup";
+    // Setup the desktop
+    cfgList << "runCommand=sh /usr/local/share/pcbsd/scripts/sys-init.sh desktop";
 
     // Refresh the xdg menus
     cfgList << "runCommand=/usr/local/bin/pc-xdgutil updatemenu";
 
     // Re-Extract PC-BSD distfile to update some pkg config files
-    cfgList << "runCommand=/usr/local/bin/pc-extractoverlay";
+    cfgList << "runCommand=/usr/local/bin/pc-extractoverlay ports";
 
     // Copy the known good xorg config to disk
     cfgList << "runExtCommand=cp /etc/X11/xorg.conf ${FSMNT}/usr/local/share/pcbsd/xorg-gui/conf/xorg.conf.basic";
 
-    // Set all firewall rules
-    cfgList << "runCommand=sh /usr/local/share/pcbsd/scripts/sys-init.sh";
-
     // Flag us for a first boot startup
+    cfgList << "runCommand=touch /var/.runxsetup";
     cfgList << "runCommand=touch /var/.pcbsd-firstboot";
     cfgList << "runCommand=touch /var/.pcbsd-firstgui";
     cfgList << "runCommand=newaliases";
 
     // Unmount our /dev
-    cfgList << "runExtCommand=umount ${FSMNT}/dev";
+    cfgList << "runExtCommand=umount -f ${FSMNT}/dev";
   } else if ( wheelCurItem == wPCSERVER || wheelCurItem == 12 ) {
     // Doing TrueOS Install
 
-    // Re-Extract TrueOS distfile to update some pkg config files
-    cfgList << "runExtCommand=cp /dist/trueos.txz ${FSMNT}/usr/local/share/pcbsd/distfiles/overlay.txz";
-    cfgList << "runCommand=/usr/local/bin/pc-extractoverlay";
+    // Setup the desktop
+    cfgList << "runCommand=sh /usr/local/share/pcbsd/scripts/sys-init.sh server";
     cfgList << "runCommand=newaliases";
 
   } else { // End of PC-BSD specific setup
@@ -1050,7 +1043,7 @@
       cfgList << "runCommand=echo 'sshd_enable=\"YES\"' >>/etc/rc.conf";
 
     // Unmount our /dev
-    cfgList << "runExtCommand=umount ${FSMNT}/dev";
+    cfgList << "runExtCommand=umount -f ${FSMNT}/dev";
   }
 
   // Now write out the cfgList to file