[PC-BSD Commits] r7465 - pcbsd/current/SysInstaller

[svn at pcbsd.org]

Author: kris
Date: 2010-08-30 14:20:19 -0700 (Mon, 30 Aug 2010)
New Revision: 7465

Removed:
   pcbsd/current/SysInstaller/arthurstyle.o
   pcbsd/current/SysInstaller/arthurwidgets.o
   pcbsd/current/SysInstaller/moc_arthurwidgets.cpp
   pcbsd/current/SysInstaller/moc_arthurwidgets.o
Modified:
   pcbsd/current/SysInstaller/sysinstaller.cpp
   pcbsd/current/SysInstaller/sysinstaller.h
Log:

Added check if we are on LIVE media to SysInstaller, use uzip archive if so, otherwise default back
to tar extraction



Modified: pcbsd/current/SysInstaller/sysinstaller.cpp
===================================================================
--- pcbsd/current/SysInstaller/sysinstaller.cpp	2010-08-30 21:14:11 UTC (rev 7464)
+++ pcbsd/current/SysInstaller/sysinstaller.cpp	2010-08-30 21:20:19 UTC (rev 7465)
@@ -101,6 +101,11 @@
     if (availPackageData)
 	initDesktopPkgs();
 
+    if ( QFile::exists("/usr/pcbsd-live") )
+    	isLiveMode = true;
+    else
+    	isLiveMode = false;
+
     // Load up the keyboard information
     connectKeyboardSlots();
 
@@ -559,8 +564,8 @@
     if ( radioInstallPCBSD->isChecked() ) {
       tmpList << "installType=PCBSD";
 
-      // If installing from a package disk, use tar if from live disk then uzip
-      if (availPackageData)
+      // If installing from a install media, use tar, otherwise uzip
+      if (!isLiveMode)
         tmpList << "packageType=tar";
       else
         tmpList << "packageType=uzip";

Modified: pcbsd/current/SysInstaller/sysinstaller.h
===================================================================
--- pcbsd/current/SysInstaller/sysinstaller.h	2010-08-30 21:14:11 UTC (rev 7464)
+++ pcbsd/current/SysInstaller/sysinstaller.h	2010-08-30 21:20:19 UTC (rev 7465)
@@ -187,6 +187,7 @@
     bool installFoundFetchOutput;
     QString fetchDownloadFile;
     bool availPackageData;
+    bool isLiveMode;
     QList<QStringList> listDeskPkgs; // QStringList for our available desktop pkgs
 
 };