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

[svn at pcbsd.org]

Author: kris
Date: 2010-12-06 09:00:34 -0800 (Mon, 06 Dec 2010)
New Revision: 8149

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

Make sure we run the pc-xdgutil once during installation to seed the xdg menu stuff



Modified: pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp	2010-12-06 16:52:35 UTC (rev 8148)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp	2010-12-06 17:00:34 UTC (rev 8149)
@@ -762,19 +762,32 @@
 
   // If this is a PC-BSD Install, do a few extra commands after everything else
   if ( radioInstallPCBSD->isChecked() ) {
-      cfgList << "runCommand=touch /var/.runxsetup";
-      cfgList << "runExtCommand=cp /etc/X11/xorg.conf ${FSMNT}/usr/local/share/pcbsd/xorg-gui/conf/xorg.conf.basic";
-      if (! radioUpgrade->isChecked() )
-      	cfgList << "runCommand=sh /usr/local/share/pcbsd/scripts/reset-firewall";
-  }
 
-  // If doing install from package disk
-  if ( (availPackageData && hasPkgsOnMedia ) || ( availPackageData && radioNetworkInstall->isChecked() ) ) {
+    // First mount /dev inside chroot
     cfgList << "runExtCommand=mount -t devfs devfs ${FSMNT}/dev";
-    cfgList+=getDeskPkgCfg(summaryList);
+
+    // Make sure the xsetup wizard starts at first boot
+    cfgList << "runCommand=touch /var/.runxsetup";
+
+    // Refresh the xdg menus
+    cfgList << "runCommand=/usr/local/bin/pc-xdgutil updatemenu";
+
+    // 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";
+
+    // If not an update, reset all firewall rules
+    if (! radioUpgrade->isChecked() )
+      cfgList << "runCommand=sh /usr/local/share/pcbsd/scripts/reset-firewall";
+ 
+    // If doing install from package disk
+    if ( (availPackageData && hasPkgsOnMedia ) || ( availPackageData && radioNetworkInstall->isChecked() ) )
+      cfgList+=getDeskPkgCfg(summaryList);
+
+    // Unmount our /dev
     cfgList << "runExtCommand=umount ${FSMNT}/dev";
-  }
 
+  } // End of PC-BSD specific setup
+
   textEditSummary->clear();
 
   // Now write out the cfgList to file