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

[svn at pcbsd.org]

Author: kris
Date: 2012-12-20 16:42:30 +0000 (Thu, 20 Dec 2012)
New Revision: 20727

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

Update install GUI to copy dist-file over as the source of overlay
data later



Modified: pcbsd/current/src-qt4/pc-installgui/installer.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-12-20 16:40:20 UTC (rev 20726)
+++ pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-12-20 16:42:30 UTC (rev 20727)
@@ -994,8 +994,8 @@
 
   cfgList+= "";
 
-  // If this is a PC-BSD Install, do a few extra commands after everything else
   if ( wheelCurItem != wFREEBSD && wheelCurItem != wPCSERVER && wheelCurItem != 12 ) {
+    // Doing PC-BSD Install
 
     // First mount /dev inside chroot
     cfgList << "runExtCommand=mount -t devfs devfs ${FSMNT}/dev";
@@ -1006,22 +1006,13 @@
     // Refresh the xdg menus
     cfgList << "runCommand=/usr/local/bin/pc-xdgutil updatemenu";
 
+    // Re-Extract PC-BSD distfile to update some pkg config files
+    cfgList << "runExtCommand=cp /dist/pcbsd.txz ${FSMNT}/usr/local/share/pcbsd/distfiles/overlay.txz";
+    cfgList << "runCommand=/usr/local/share/pcbsd/scripts/extract-overlay.sh";
+
     // 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";
 
-    // Save the selected lang / layout
-    QString lang = languages.at(comboLanguage->currentIndex());
-    // Grab the language code
-    lang.truncate(lang.lastIndexOf(")"));
-    lang.remove(0, lang.lastIndexOf("(") + 1);
-
-    // KPM
-    //QString layout = listKbLayouts->currentItem()->text();
-    //layout = layout.remove(0, layout.indexOf("- (") + 3 );
-    //layout.truncate(layout.size() -1 );
-    //cfgList << "runCommand=/usr/local/share/pcbsd/scripts/set-lang.sh " + lang + " " + layout;
- 
-
     // Set all firewall rules
     cfgList << "runCommand=sh /usr/local/share/pcbsd/scripts/sys-init.sh";
 
@@ -1031,9 +1022,15 @@
 
     // Unmount our /dev
     cfgList << "runExtCommand=umount ${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/share/pcbsd/scripts/extract-overlay.sh";
+
   } else { // End of PC-BSD specific setup
-    // FreeBSD specific config options
+    // Doing FreeBSD Install
     cfgList+=getUsersCfgSettings();
 
     // First mount /dev inside chroot