[PC-BSD Commits] r7719 - in pcbsd/current: mfsroot-overlay/etc src-qt4/pc-sysinstaller

[svn at pcbsd.org]

Author: kris
Date: 2010-10-06 11:15:24 -0700 (Wed, 06 Oct 2010)
New Revision: 7719

Modified:
   pcbsd/current/mfsroot-overlay/etc/SetupInstall.sh
   pcbsd/current/mfsroot-overlay/etc/SetupLive.sh
   pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp
Log:


update location of install media flag files to /tmp, since /usr
is not always mounted writable.



Modified: pcbsd/current/mfsroot-overlay/etc/SetupInstall.sh
===================================================================
--- pcbsd/current/mfsroot-overlay/etc/SetupInstall.sh	2010-10-06 09:01:09 UTC (rev 7718)
+++ pcbsd/current/mfsroot-overlay/etc/SetupInstall.sh	2010-10-06 18:15:24 UTC (rev 7719)
@@ -20,8 +20,8 @@
 export PATH
 
 # See if we have install / meta pkgs for the front-end to use
-if [ -e "/cdmnt/no-meta-pkgs" ] ; then touch /usr/no-meta-pkgs ; fi
-if [ -e "/cdmnt/no-install-pkgs" ] ; then touch /usr/no-install-pkgs ; fi
+if [ -e "/cdmnt/no-meta-pkgs" ] ; then touch /tmp/no-meta-pkgs ; fi
+if [ -e "/cdmnt/no-install-pkgs" ] ; then touch /tmp/no-install-pkgs ; fi
 
 # Check if we have a pc-autoinstall.conf file
 if [ -e "/cdmnt/boot/pc-autoinstall.conf" ]

Modified: pcbsd/current/mfsroot-overlay/etc/SetupLive.sh
===================================================================
--- pcbsd/current/mfsroot-overlay/etc/SetupLive.sh	2010-10-06 09:01:09 UTC (rev 7718)
+++ pcbsd/current/mfsroot-overlay/etc/SetupLive.sh	2010-10-06 18:15:24 UTC (rev 7719)
@@ -41,8 +41,8 @@
 done
 
 # See if we have install / meta pkgs for the front-end to use 
-if [ -e "/cdmnt/no-meta-pkgs" ] ; then touch /usr/no-meta-pkgs ; fi
-if [ -e "/cdmnt/no-install-pkgs" ] ; then touch /usr/no-install-pkgs ; fi
+if [ -e "/cdmnt/no-meta-pkgs" ] ; then touch /tmp/no-meta-pkgs ; fi
+if [ -e "/cdmnt/no-install-pkgs" ] ; then touch /tmp/no-install-pkgs ; fi
 
 # Now make /PCBSD sym-links
 rm /usr/PCBSD

Modified: pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp	2010-10-06 09:01:09 UTC (rev 7718)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.cpp	2010-10-06 18:15:24 UTC (rev 7719)
@@ -102,19 +102,19 @@
 	initDesktopPkgs();
 
     // Do check for available meta-pkgs on boot media
-    if ( QFile::exists("/usr/no-meta-pkgs") )
+    if ( QFile::exists("/tmp/no-meta-pkgs") )
     	hasPkgsOnMedia = false;
     else
     	hasPkgsOnMedia = true;
 
     // Do check for install pkgs on boot media
-    if ( QFile::exists("/usr/no-install-pkgs") )
+    if ( QFile::exists("/tmp/no-install-pkgs") )
     	hasInstallOnMedia = false;
     else
     	hasInstallOnMedia = true;
 
     // Is this a LIVE disk?
-    if ( QFile::exists("/usr/pcbsd-live") )
+    if ( QFile::exists("/tmp/pcbsd-live") )
     	isLiveMode = true;
     else
     	isLiveMode = false;