mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

More ZFS cleanups

Browse Source
This commit is contained in:
Scott Ullrich 2010-08-14 20:25:10 -04:00
parent 6e8e75b18e
commit f38e4f2695
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PCBSD/pc-sysinstall/backend/functions-cleanup.sh
View File

@ -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

2
PCBSD/pc-sysinstall/backend/functions-unmount.sh
View File

@ -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

2
usr/local/www/installer.php
View File

@ -115,7 +115,7 @@ function start_installation() {
fwrite($fd, "chmod a+rx /usr/local/bin/after_installation_routines.sh\n");
fwrite($fd, "cd / && /usr/local/bin/after_installation_routines.sh\n");
fwrite($fd, "mkdir /mnt/tmp\n");
fwrite($fd, "umount /mnt\n");
// fwrite($fd, "umount /mnt\n");
fwrite($fd, "touch /tmp/install_complete\n");
fclose($fd);
exec("chmod a+rx /tmp/installer.sh");