[PC-BSD Commits] r17333 - in pcbsd/current/overlays/install-overlay: etc root

[svn at pcbsd.org]

Author: kris
Date: 2012-06-20 13:12:16 +0000 (Wed, 20 Jun 2012)
New Revision: 17333

Modified:
   pcbsd/current/overlays/install-overlay/etc/SetupInstall.sh
   pcbsd/current/overlays/install-overlay/etc/SetupLive.sh
   pcbsd/current/overlays/install-overlay/root/PCBSDStart.sh
Log:

Use /memfs as memory file system on install media, since /uzip is read-only



Modified: pcbsd/current/overlays/install-overlay/etc/SetupInstall.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/etc/SetupInstall.sh	2012-06-20 13:06:11 UTC (rev 17332)
+++ pcbsd/current/overlays/install-overlay/etc/SetupInstall.sh	2012-06-20 13:12:16 UTC (rev 17333)
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 
-# Setup the /uzip memory device
-echo "Mounting /uzip"
+# Setup the /memfs memory device
+echo "Mounting /memfs"
 
 # Do a check of available memory 
 sysMem=`/sbin/sysctl hw.realmem | /bin/cut -d ' ' -f 2`
@@ -10,7 +10,7 @@
 if [ $sysMem -lt $minSize ] ; then
   MDSIZE="10"
   echo "Creating ${MDSIZE}MB ramdisk..."
-  /sbin/mdmfs -S -s ${MDSIZE}M -O space md2 /uzip
+  /sbin/mdmfs -S -s ${MDSIZE}M -O space md2 /memfs
 
   echo "Mounting /usr"
   MDDEVICE="`/sbin/mdconfig -a -t vnode -o readonly -f /uzip/usr.uzip`.uzip"
@@ -21,14 +21,14 @@
   MDSIZE="`/bin/du -m /uzip/usr.uzip | /bin/cut -f 1`"
   MDSIZE="`/bin/expr ${MDSIZE} + 110`"
   echo "Creating ${MDSIZE}MB ramdisk..."
-  /sbin/mdmfs -S -s ${MDSIZE}M -O space md2 /uzip
+  /sbin/mdmfs -S -s ${MDSIZE}M -O space md2 /memfs
 
   echo "Copying setup image into memory... Please Wait..."
-  /bin/cp /uzip/usr.uzip /uzip/
+  /bin/cp /uzip/usr.uzip /memfs/
 
   # Mount the  "usr" directory
   echo "Mounting /usr"
-  MDDEVICE="`/sbin/mdconfig -a -t vnode -o readonly -f /uzip/usr.uzip`.uzip"
+  MDDEVICE="`/sbin/mdconfig -a -t vnode -o readonly -f /memfs/usr.uzip`.uzip"
   /sbin/mount -r /dev/$MDDEVICE /usr
 
   # End of loading if we have > 512MB ram

Modified: pcbsd/current/overlays/install-overlay/etc/SetupLive.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/etc/SetupLive.sh	2012-06-20 13:06:11 UTC (rev 17332)
+++ pcbsd/current/overlays/install-overlay/etc/SetupLive.sh	2012-06-20 13:12:16 UTC (rev 17333)
@@ -18,19 +18,19 @@
   MDDEVICE="`/sbin/mdconfig -a -t vnode -o readonly -f /PCBSD.ufs.uzip`.uzip"
   /sbin/mount -r /dev/$MDDEVICE /mntuzip
   # Make the kernel available
-  /sbin/mdmfs -S -s 2M -O space md2 /uzip
+  /sbin/mdmfs -S -s 5M -O space md2 /memfs
 
 else
   # We have enough space to copy the uzip file to memory and run from RAM, yay!
 
   echo "Creating ${MDSIZE}MB ramdisk..."
-  /sbin/mdmfs -S -s ${MDSIZE}M -O space md2 /uzip
+  /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 /uzip/
+  /bin/cp /PCBSD.ufs.uzip /memfs/
 
   echo "Mounting /usr"
   mkdir /mntuzip >/dev/null 2>/dev/null
-  MDDEVICE="`/sbin/mdconfig -a -t vnode -o readonly -f /uzip/PCBSD.ufs.uzip`.uzip"
+  MDDEVICE="`/sbin/mdconfig -a -t vnode -o readonly -f /memfs/PCBSD.ufs.uzip`.uzip"
   /sbin/mount -r /dev/$MDDEVICE /mntuzip
 fi
 

Modified: pcbsd/current/overlays/install-overlay/root/PCBSDStart.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/root/PCBSDStart.sh	2012-06-20 13:06:11 UTC (rev 17332)
+++ pcbsd/current/overlays/install-overlay/root/PCBSDStart.sh	2012-06-20 13:12:16 UTC (rev 17333)
@@ -49,8 +49,8 @@
 fi
 
 # Run the intial sorting of directories
-mv /root/.fluxbox /uzip/
-ln -s /uzip/.fluxbox /root/.fluxbox
+mv /root/.fluxbox /memfs/
+ln -s /memfs/.fluxbox /root/.fluxbox
 
 # Create the .qt directory
 mkdir /tmp/.qt