d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes a bug when installing with a ZFS on root (/) and UFS /boot

Browse Source 
partition. Don't stamp the zfs boot-loader in this case.

Submitted by:	kris moore
This commit is contained in:
imp 2010-07-31 19:27:43 +00:00
parent ed05266834
commit 994e84c9df
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.sbin/pc-sysinstall/backend/functions-newfs.sh
View File

@ -61,6 +61,7 @@ setup_zfs_filesystem()
# Check if we ended up with needing a zfs bootable partition
if [ "${i}" = "/" -o "${i}" = "/boot" ]
then
if [ "$HAVEBOOT" = "YES" ] ; then continue ; fi
if [ "${PARTGEOM}" = "MBR" ]
then
# Lets stamp the proper ZFS boot loader
@ -129,6 +130,11 @@ setup_filesystems()
rc_halt "sync"
rc_halt "glabel label ${PARTLABEL} /dev/${PART}${EXT}"
rc_halt "sync"
# Set flag that we've found a boot partition
if [ "$PARTMNT" = "/boot" -o "${PARTMNT}" = "/" ] ; then
HAVEBOOT="YES"
fi
sleep 2
;;
UFS+S) echo_log "NEWFS: /dev/${PART} - ${PARTFS}"
@ -138,6 +144,10 @@ setup_filesystems()
rc_halt "sync"
rc_halt "glabel label ${PARTLABEL} /dev/${PART}${EXT}"
rc_halt "sync"
# Set flag that we've found a boot partition
if [ "$PARTMNT" = "/boot" -o "${PARTMNT}" = "/" ] ; then
HAVEBOOT="YES"
fi
sleep 2
;;
UFS+J) echo_log "NEWFS: /dev/${PART} - ${PARTFS}"
@ -151,6 +161,10 @@ setup_filesystems()
rc_halt "sync"
rc_halt "glabel label ${PARTLABEL} /dev/${PART}${EXT}.journal"
rc_halt "sync"
# Set flag that we've found a boot partition
if [ "$PARTMNT" = "/boot" -o "${PARTMNT}" = "/" ] ; then
HAVEBOOT="YES"
fi
sleep 2
;;
ZFS) echo_log "NEWFS: /dev/${PART} - ${PARTFS}"