From 5e8aea0beb0a64e5ea28302c63033ae52a2f5d8b Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sat, 14 Aug 2010 19:29:00 -0400
Subject: Misc changes to make ZFS installations work.

---
 PCBSD/pc-sysinstall/backend/functions-cleanup.sh | 8 ++++----
 PCBSD/pc-sysinstall/backend/functions-unmount.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/PCBSD/pc-sysinstall/backend/functions-cleanup.sh b/PCBSD/pc-sysinstall/backend/functions-cleanup.sh
index e14d9fe..059e07c 100644
--- a/PCBSD/pc-sysinstall/backend/functions-cleanup.sh
+++ b/PCBSD/pc-sysinstall/backend/functions-cleanup.sh
@@ -42,7 +42,7 @@ zfs_cleanup_unmount()
     cat ${FSMNT}/etc/rc.conf 2>/dev/null | grep 'zfs_enable="YES"' >/dev/null 2>/dev/null
     if [ "$?" != "0" ]
     then
-      echo 'zfs_enable="YES"' >>${FSMNT}/etc/rc.conf
+      #echo 'zfs_enable="YES"' >>${FSMNT}/etc/rc.conf
     fi
 
     sleep 2
@@ -73,9 +73,9 @@ zfs_cleanup_unmount()
       do
         if [ "${ZMNT}" != "/" ]
         then
-          rc_halt "zfs set mountpoint=${ZMNT} ${ZPOOLNAME}${ZMNT}"
-          rc_halt "zfs unmount ${ZPOOLNAME}${ZMNT}"
-          sleep 2
+          #rc_halt "zfs set mountpoint=${ZMNT} ${ZPOOLNAME}${ZMNT}"
+          #rc_halt "zfs unmount ${ZPOOLNAME}${ZMNT}"
+          #sleep 2
         fi
       done 
     fi
diff --git a/PCBSD/pc-sysinstall/backend/functions-unmount.sh b/PCBSD/pc-sysinstall/backend/functions-unmount.sh
index f47c3fb..e1e769b 100644
--- a/PCBSD/pc-sysinstall/backend/functions-unmount.sh
+++ b/PCBSD/pc-sysinstall/backend/functions-unmount.sh
@@ -90,7 +90,7 @@ unmount_all_filesystems()
     # If are using a ZFS on "/" set it to legacy
    if [ ! -z "${FOUNDZFSROOT}" ]
    then
-     rc_halt "zfs set mountpoint=legacy ${FOUNDZFSROOT}"
+     #rc_halt "zfs set mountpoint=legacy ${FOUNDZFSROOT}"
    fi
 
    # If we need to relabel "/" do it now
-- 
cgit v1.1