[PC-BSD Commits] r4811 - pcbsd/trunk/mfsroot-overlay/etc

[svn at pcbsd.org]

Author: kris
Date: 2009-10-29 08:24:50 -0700 (Thu, 29 Oct 2009)
New Revision: 4811

Modified:
   pcbsd/trunk/mfsroot-overlay/etc/pcbsd-rc.sh
Log:

ZFS is enabled by default now, don't need to do extra tweaks in rc



Modified: pcbsd/trunk/mfsroot-overlay/etc/pcbsd-rc.sh
===================================================================
--- pcbsd/trunk/mfsroot-overlay/etc/pcbsd-rc.sh	2009-10-29 15:22:53 UTC (rev 4810)
+++ pcbsd/trunk/mfsroot-overlay/etc/pcbsd-rc.sh	2009-10-29 15:24:50 UTC (rev 4811)
@@ -151,30 +151,6 @@
   
 MEM=`sysctl hw.realmem | cut -d " " -f 2`
 
-# Check if the user enabled ZFS support and do it
-bootzfs="NO"
-v=`/bin/kenv bootzfs`
-if [ $? -eq 0 ]; then
-        bootzfs=$v
-fi
-
-if [ "$bootzfs" = "YES" ]
-then
-  if [ $MEM -gt 1000000000 ]
-  then
-    echo '
-zfs_enable="YES"' >> /etc/rc.conf
-    /etc/rc.d/zfs start
-    touch /tmp/zfsEnabled
-  else
-     echo "WARNING: ZFS was enabled, but the system does not have the required 1GB of memory!"
-     echo "Please increase the memory to 1GB or above to install with ZFS."
-     echo "You may still install normally with UFS2 or UFS2 + Journaling."
-     echo "[Press Enter to Continue]"
-     read tmp
-  fi
-fi
-
 # Check if we are booting in LIVE or INSTALL mode
 bootlive="NO"
 l=`/bin/kenv boot_livedvd 2>/dev/null`