[PC-BSD Commits] r12722 - pcbsd/current/mfsroot-overlay/etc

[svn at pcbsd.org]

Author: kris
Date: 2011-09-08 09:44:03 -0700 (Thu, 08 Sep 2011)
New Revision: 12722

Modified:
   pcbsd/current/mfsroot-overlay/etc/SetupInstall.sh
   pcbsd/current/mfsroot-overlay/etc/SetupLive.sh
   pcbsd/current/mfsroot-overlay/etc/pcbsd-rc.sh
Log:

Make sure we only run the kld script after mounting /usr stuff



Modified: pcbsd/current/mfsroot-overlay/etc/SetupInstall.sh
===================================================================
--- pcbsd/current/mfsroot-overlay/etc/SetupInstall.sh	2011-09-08 16:39:59 UTC (rev 12721)
+++ pcbsd/current/mfsroot-overlay/etc/SetupInstall.sh	2011-09-08 16:44:03 UTC (rev 12722)
@@ -16,6 +16,9 @@
 MDDEVICE="`/sbin/mdconfig -a -t vnode -o readonly -f /uzip/usr.uzip`.uzip"
 /sbin/mount -r /dev/$MDDEVICE /usr
 
+# Load the extra klds we need
+/etc/rc.d/kld start
+
 PATH="${PATH}:/usr/bin"
 export PATH
 

Modified: pcbsd/current/mfsroot-overlay/etc/SetupLive.sh
===================================================================
--- pcbsd/current/mfsroot-overlay/etc/SetupLive.sh	2011-09-08 16:39:59 UTC (rev 12721)
+++ pcbsd/current/mfsroot-overlay/etc/SetupLive.sh	2011-09-08 16:44:03 UTC (rev 12722)
@@ -17,6 +17,7 @@
   echo "Mounting /usr"
   MDDEVICE="`/sbin/mdconfig -a -t vnode -o readonly -f /cdmnt/PCBSD.ufs.uzip`.uzip"
   /sbin/mount -r /dev/$MDDEVICE /mntuzip
+
 else
   # We have enough space to copy the uzip file to memory and run from RAM, yay!
 
@@ -29,7 +30,7 @@
   mkdir /mntuzip >/dev/null 2>/dev/null
   MDDEVICE="`/sbin/mdconfig -a -t vnode -o readonly -f /uzip/PCBSD.ufs.uzip`.uzip"
   /sbin/mount -r /dev/$MDDEVICE /mntuzip
-  /sbin/umount /cdmnt
+
 fi
 
 /sbin/mdmfs -S -s 2M -O space md5 /usr
@@ -40,6 +41,14 @@
   ln -s /mntuzip/usr/$i /usr/$i
 done
 
+# Load the extra klds we need
+/etc/rc.d/kld start
+
+# Unmount the CD if using memory
+if [ $MEM -gt $MDCHECK ]; then
+  /sbin/umount /cdmnt
+fi
+
 # See if we have install / meta pkgs for the front-end to use 
 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

Modified: pcbsd/current/mfsroot-overlay/etc/pcbsd-rc.sh
===================================================================
--- pcbsd/current/mfsroot-overlay/etc/pcbsd-rc.sh	2011-09-08 16:39:59 UTC (rev 12721)
+++ pcbsd/current/mfsroot-overlay/etc/pcbsd-rc.sh	2011-09-08 16:44:03 UTC (rev 12722)
@@ -146,9 +146,6 @@
         read tmp
 fi
 
-# Load the extra klds we need
-/etc/rc.d/kld start
-
 # If we have a LIVE image, boot with it
 if [ -e "/cdmnt/PCBSD.ufs.uzip" ]
 then