[PC-BSD Commits] r5659 - pcbsd/trunk/mfsroot-overlay/root

[svn at pcbsd.org]

Author: kris
Date: 2009-12-18 10:10:41 -0800 (Fri, 18 Dec 2009)
New Revision: 5659

Modified:
   pcbsd/trunk/mfsroot-overlay/root/PCBSDStart.sh
   pcbsd/trunk/mfsroot-overlay/root/PCBSDStartLive.sh
Log:

Fixed a few bugs with Live Mode, don't nullfsmount SysInstaller when using LIVE mode, and
don't create huge logfile in /tmp, limmited space here :)



Modified: pcbsd/trunk/mfsroot-overlay/root/PCBSDStart.sh
===================================================================
--- pcbsd/trunk/mfsroot-overlay/root/PCBSDStart.sh	2009-12-18 17:44:52 UTC (rev 5658)
+++ pcbsd/trunk/mfsroot-overlay/root/PCBSDStart.sh	2009-12-18 18:10:41 UTC (rev 5659)
@@ -15,10 +15,6 @@
 # Make /usr/PCBSD link
 ln -s /usr/PCBSD /PCBSD >/dev/null 2>/dev/null
 
-# Mount our pc-sysinstall && SysInstaller with nullfs, makes them writable and able to debug
-mount_nullfs /root/SysInstaller /usr/PCBSD/SysInstaller
-mount_nullfs /root/pc-sysinstall /usr/PCBSD/pc-sysinstall
-
 # Check if we are booting in LIVE or INSTALL mode
 bootlive="NO"
 l=`/bin/kenv boot_livedvd 2>/dev/null`
@@ -28,6 +24,10 @@
   exit 0
 fi
 
+# Mount our pc-sysinstall && SysInstaller with nullfs, makes them writable and able to debug
+mount_nullfs /root/SysInstaller /usr/PCBSD/SysInstaller
+mount_nullfs /root/pc-sysinstall /usr/PCBSD/pc-sysinstall
+
 # Check if we have an auto-install directive
 if [ -e "/tmp/pc-autoinstall.conf" ]
 then

Modified: pcbsd/trunk/mfsroot-overlay/root/PCBSDStartLive.sh
===================================================================
--- pcbsd/trunk/mfsroot-overlay/root/PCBSDStartLive.sh	2009-12-18 17:44:52 UTC (rev 5658)
+++ pcbsd/trunk/mfsroot-overlay/root/PCBSDStartLive.sh	2009-12-18 18:10:41 UTC (rev 5659)
@@ -88,13 +88,13 @@
   echo "ERROR: Failed to start X with detected driver... Trying SAFE mode..."
   rm /etc/X11/xorg.conf
   /root/cardDetect/x_config.sh
-  startx 2>/tmp/xstartup2.log
+  startx
   if [ ! -e "/tmp/.xstarted" ]
   then
     echo "ERROR: Failed to start X in SAFE mode... Trying VESA mode..."
     rm /etc/X11/xorg.conf
     cp /root/cardDetect/XF86Config.compat /etc/X11/xorg.conf
-    startx 2>/tmp/xstartup2.log
+    startx
     if [ ! -e "/tmp/.xstarted" ]
     then
       echo "ERROR: Failed to start X with VESA mode..."