[PC-BSD Commits] r5711 - in pcbsd/trunk/pc-sysinstall: backend conf

[svn at pcbsd.org]

Author: kris
Date: 2009-12-29 11:30:31 -0800 (Tue, 29 Dec 2009)
New Revision: 5711

Modified:
   pcbsd/trunk/pc-sysinstall/backend/functions-mountoptical.sh
   pcbsd/trunk/pc-sysinstall/conf/pc-sysinstall.conf
Log:

Changed location of cdmnt for install, which prevents conflicts with live Mode



Modified: pcbsd/trunk/pc-sysinstall/backend/functions-mountoptical.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-mountoptical.sh	2009-12-29 19:22:54 UTC (rev 5710)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-mountoptical.sh	2009-12-29 19:30:31 UTC (rev 5711)
@@ -25,7 +25,13 @@
 {
  FOUND="0"
 
+ # Ensure we have a directory where its supposed to be
+ if [ ! -d "${CDMNT}" ]
+ then
+   mkdir -p ${CDMNT}
+ fi
 
+
  # Start by checking if we already have a cd mounted at CDMNT
  mount | grep "${CDMNT} " >/dev/null 2>/dev/null
  if [ "$?" = "0" ]

Modified: pcbsd/trunk/pc-sysinstall/conf/pc-sysinstall.conf
===================================================================
--- pcbsd/trunk/pc-sysinstall/conf/pc-sysinstall.conf	2009-12-29 19:22:54 UTC (rev 5710)
+++ pcbsd/trunk/pc-sysinstall/conf/pc-sysinstall.conf	2009-12-29 19:30:31 UTC (rev 5711)
@@ -35,7 +35,7 @@
 export RSYNCTRIES
 
 # Set our mount-points
-CDMNT="/cdmnt"
+CDMNT="/cdmnt-install"
 FSMNT="/mnt"
 UZIP_DIR="/usr"
 export FSMNT CDMNT UZIP_DIR