[PC-BSD Commits] r17335 - pcbsd/current/overlays/install-overlay/etc

[svn at pcbsd.org]

Author: kris
Date: 2012-06-20 13:20:18 +0000 (Wed, 20 Jun 2012)
New Revision: 17335

Modified:
   pcbsd/current/overlays/install-overlay/etc/SetupLive.sh
   pcbsd/current/overlays/install-overlay/etc/pcbsd-rc.sh
Log:

Move some files to /dist and /uzip



Modified: pcbsd/current/overlays/install-overlay/etc/SetupLive.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/etc/SetupLive.sh	2012-06-20 13:17:27 UTC (rev 17334)
+++ pcbsd/current/overlays/install-overlay/etc/SetupLive.sh	2012-06-20 13:20:18 UTC (rev 17335)
@@ -6,7 +6,7 @@
 MEM="`/bin/expr $MEM / 1024`"
 
 # Lets check and see if we have enough RAM to copy the .uzip file
-MDSIZE="`/usr/bin/du -m /PCBSD.ufs.uzip | /usr/bin/cut -f 1`"
+MDSIZE="`/usr/bin/du -m /dist/PCBSD.ufs.uzip | /usr/bin/cut -f 1`"
 MDSIZE="`/bin/expr ${MDSIZE} + 300`"
 MDCHECK="`/bin/expr ${MDSIZE} + 512`"
 if [ $MEM -lt $MDCHECK ]
@@ -15,7 +15,7 @@
   echo "Mounting PCBSD.ufs.uzip.."
   # Mount the  "usr" directory
   echo "Mounting /usr"
-  MDDEVICE="`/sbin/mdconfig -a -t vnode -o readonly -f /PCBSD.ufs.uzip`.uzip"
+  MDDEVICE="`/sbin/mdconfig -a -t vnode -o readonly -f /dist/PCBSD.ufs.uzip`.uzip"
   /sbin/mount -r /dev/$MDDEVICE /mntuzip
   # Make the kernel available
   /sbin/mdmfs -S -s 5M -O space md2 /memfs
@@ -26,7 +26,7 @@
   echo "Creating ${MDSIZE}MB ramdisk..."
   /sbin/mdmfs -S -s ${MDSIZE}M -O space md2 /memfs
   echo "Copying LIVE image into memory... This will take a while, please wait (ctrl-t for status)..."
-  /bin/cp /PCBSD.ufs.uzip /memfs/
+  /bin/cp /dist/PCBSD.ufs.uzip /memfs/
 
   echo "Mounting /usr"
   mkdir /mntuzip >/dev/null 2>/dev/null

Modified: pcbsd/current/overlays/install-overlay/etc/pcbsd-rc.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/etc/pcbsd-rc.sh	2012-06-20 13:17:27 UTC (rev 17334)
+++ pcbsd/current/overlays/install-overlay/etc/pcbsd-rc.sh	2012-06-20 13:20:18 UTC (rev 17335)
@@ -24,7 +24,7 @@
 mkdir /tmp/zfs
 
 # If we have a LIVE image, boot with it
-if [ -e "/PCBSD.ufs.uzip" ]
+if [ -e "/dist/PCBSD.ufs.uzip" ]
 then
   MEM=`sysctl hw.realmem | cut -d " " -f 2`
 
@@ -54,8 +54,8 @@
 
 # Extract the root-dist.txz
 /sbin/mdmfs -S -s 20M -O space md8 /root
-/usr/bin/tar xvf /root-dist.txz -C /root >/dev/null 2>/dev/null
+/usr/bin/tar xvf /uzip/root-dist.txz -C /root >/dev/null 2>/dev/null
 
 # Extract the var-dist.txz
 /sbin/mdmfs -S -s 20M -O space md9 /var
-/usr/bin/tar xvf /var-dist.txz -C /var >/dev/null 2>/dev/null
+/usr/bin/tar xvf /uzip/var-dist.txz -C /var >/dev/null 2>/dev/null