[PC-BSD Commits] r7110 - pcbsd/stable/pc-sysinstall/backend

[svn at pcbsd.org]

Author: kris
Date: 2010-07-02 10:25:46 -0700 (Fri, 02 Jul 2010)
New Revision: 7110

Modified:
   pcbsd/stable/pc-sysinstall/backend/functions-newfs.sh
Log:

Fixed a bug in pc-sysinstall when using a dedicated /boot partition and ZFS for "/", don't need to stamp zfsboot



Modified: pcbsd/stable/pc-sysinstall/backend/functions-newfs.sh
===================================================================
--- pcbsd/stable/pc-sysinstall/backend/functions-newfs.sh	2010-07-02 17:00:21 UTC (rev 7109)
+++ pcbsd/stable/pc-sysinstall/backend/functions-newfs.sh	2010-07-02 17:25:46 UTC (rev 7110)
@@ -35,6 +35,7 @@
     # 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
@@ -103,6 +104,11 @@
               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}"
@@ -112,6 +118,10 @@
               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}"
@@ -125,6 +135,10 @@
               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}"