diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2010-08-14 19:29:00 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2010-08-14 19:29:00 -0400 |
| commit | 5e8aea0beb0a64e5ea28302c63033ae52a2f5d8b (patch) | |
| tree | 7665433ecdd9eb705b7ca59b40ceeee5263873d7 /PCBSD | |
| parent | e318ec089055de2754818aeb726a9b95a6a22ad4 (diff) | |
| download | pfsense-5e8aea0beb0a64e5ea28302c63033ae52a2f5d8b.zip pfsense-5e8aea0beb0a64e5ea28302c63033ae52a2f5d8b.tar.gz | |
Misc changes to make ZFS installations work.
Diffstat (limited to 'PCBSD')
| -rw-r--r-- | PCBSD/pc-sysinstall/backend/functions-cleanup.sh | 8 | ||||
| -rw-r--r-- | 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 |
