[PC-BSD Commits] r7328 - in pcbsd: current/SysInstaller stable/SysInstaller

[svn at pcbsd.org]

Author: kris
Date: 2010-08-02 07:05:36 -0700 (Mon, 02 Aug 2010)
New Revision: 7328

Modified:
   pcbsd/current/SysInstaller/sysinstaller.cpp
   pcbsd/stable/SysInstaller/sysinstaller.cpp
Log:

Added fix to SysInstaller, make sure we copy valid xorg.conf to system for use by Xorg gui setup tool after installation of PC-BSD. This ensures we use the exact same config used by the installer in setting up display post-install



Modified: pcbsd/current/SysInstaller/sysinstaller.cpp
===================================================================
--- pcbsd/current/SysInstaller/sysinstaller.cpp	2010-08-02 09:02:56 UTC (rev 7327)
+++ pcbsd/current/SysInstaller/sysinstaller.cpp	2010-08-02 14:05:36 UTC (rev 7328)
@@ -540,6 +540,7 @@
       tmpList << "installType=PCBSD";
       tmpList << "packageType=uzip";
       tmpList << "runCommand=cp /usr/local/share/xorg-gui/conf/ttys.xsetup /etc/ttys";
+      tmpList << "runExtCommand=cp /etc/X11/xorg.conf ${FSMNT}/usr/local/share/xorg-gui/conf/xorg.conf.basic";
       summaryList << tr("Performing a system upgrade of PC-BSD on:") + " /dev/" + upDrive;
     } else {
       tmpList << "installType=FreeBSD";
@@ -556,6 +557,7 @@
       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";

Modified: pcbsd/stable/SysInstaller/sysinstaller.cpp
===================================================================
--- pcbsd/stable/SysInstaller/sysinstaller.cpp	2010-08-02 09:02:56 UTC (rev 7327)
+++ pcbsd/stable/SysInstaller/sysinstaller.cpp	2010-08-02 14:05:36 UTC (rev 7328)
@@ -540,6 +540,7 @@
       tmpList << "installType=PCBSD";
       tmpList << "packageType=uzip";
       tmpList << "runCommand=cp /usr/PCBSD/xorg-gui/conf/ttys.xsetup /etc/ttys";
+      tmpList << "runExtCommand=cp /etc/X11/xorg.conf ${FSMNT}/usr/PCBSD/xorg-gui/conf/xorg.conf.basic";
       summaryList << tr("Performing a system upgrade of PC-BSD on:") + " /dev/" + upDrive;
     } else {
       tmpList << "installType=FreeBSD";
@@ -556,6 +557,7 @@
       tmpList << "# Doing PC-BSD Install make sure to start xorg-gui at first boot";
       tmpList << "runCommand=cp /usr/PCBSD/xorg-gui/conf/ttys.xsetup /etc/ttys";
       tmpList << "runCommand=sh /usr/PCBSD/Scripts/reset-firewall";
+      tmpList << "runExtCommand=cp /etc/X11/xorg.conf ${FSMNT}/usr/PCBSD/xorg-gui/conf/xorg.conf.basic";
       summaryList << tr("Performing a fresh install of PC-BSD");
     } else {
       tmpList << "installType=FreeBSD";