svn commit: r210701 - head/usr.sbin/pc-sysinstall/backend

Warner Losh imp at FreeBSD.org
Sat Jul 31 19:27:44 UTC 2010


Author: imp
Date: Sat Jul 31 19:27:43 2010
New Revision: 210701
URL: http://svn.freebsd.org/changeset/base/210701

Log:
  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

Modified:
  head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh

Modified: head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh	Sat Jul 31 19:25:51 2010	(r210700)
+++ head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh	Sat Jul 31 19:27:43 2010	(r210701)
@@ -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}" 


More information about the svn-src-head mailing list