diff options
| author | imp <imp@FreeBSD.org> | 2010-07-31 19:27:43 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2010-07-31 19:27:43 +0000 |
| commit | 994e84c9df8b7b76acf2882863349a4b860f35f1 (patch) | |
| tree | 4b55e49b2d41570acc54ff8e3b8ee7278d860fd4 /usr.sbin/pc-sysinstall | |
| parent | ed05266834d55ae1c45b19cf25d700c85c6153b2 (diff) | |
| download | FreeBSD-src-994e84c9df8b7b76acf2882863349a4b860f35f1.zip FreeBSD-src-994e84c9df8b7b76acf2882863349a4b860f35f1.tar.gz | |
Fixes a bug when installing with a ZFS on root (/) and UFS /boot
partition. Don't stamp the zfs boot-loader in this case.
Submitted by: kris moore
Diffstat (limited to 'usr.sbin/pc-sysinstall')
| -rwxr-xr-x | usr.sbin/pc-sysinstall/backend/functions-newfs.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/usr.sbin/pc-sysinstall/backend/functions-newfs.sh b/usr.sbin/pc-sysinstall/backend/functions-newfs.sh index 6f617ea..84fc1b7 100755 --- a/usr.sbin/pc-sysinstall/backend/functions-newfs.sh +++ b/usr.sbin/pc-sysinstall/backend/functions-newfs.sh @@ -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}" |
