summaryrefslogtreecommitdiffstats
path: root/PCBSD
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2010-08-14 20:25:10 -0400
committerScott Ullrich <sullrich@pfsense.org>2010-08-14 20:25:10 -0400
commitf38e4f2695005a010bd8ac3e46bdeaa25efcc3a1 (patch)
tree6b67f2c6a33b364fa7242e71039593721718663c /PCBSD
parent6e8e75b18ebf78e5e48f7f87d3c240547939c6a6 (diff)
downloadpfsense-f38e4f2695005a010bd8ac3e46bdeaa25efcc3a1.zip
pfsense-f38e4f2695005a010bd8ac3e46bdeaa25efcc3a1.tar.gz
More ZFS cleanups
Diffstat (limited to 'PCBSD')
-rw-r--r--PCBSD/pc-sysinstall/backend/functions-cleanup.sh3
-rw-r--r--PCBSD/pc-sysinstall/backend/functions-unmount.sh2
2 files changed, 3 insertions, 2 deletions
diff --git a/PCBSD/pc-sysinstall/backend/functions-cleanup.sh b/PCBSD/pc-sysinstall/backend/functions-cleanup.sh
index fefad07..1c29190 100644
--- a/PCBSD/pc-sysinstall/backend/functions-cleanup.sh
+++ b/PCBSD/pc-sysinstall/backend/functions-cleanup.sh
@@ -73,7 +73,8 @@ zfs_cleanup_unmount()
do
if [ "${ZMNT}" != "/" ]
then
- rc_halt "zfs set mountpoint=${ZMNT} ${ZPOOLNAME}${ZMNT}"
+ #rc_halt "zfs set mountpoint=${ZMNT} ${ZPOOLNAME}${ZMNT}"
+ rc_halt "zfs set mountpoint=${ZMNT} ${ZPOOLNAME}"
#rc_halt "zfs unmount ${ZPOOLNAME}${ZMNT}"
#sleep 2
fi
diff --git a/PCBSD/pc-sysinstall/backend/functions-unmount.sh b/PCBSD/pc-sysinstall/backend/functions-unmount.sh
index e1e769b..f47c3fb 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
OpenPOWER on IntegriCloud