[PC-BSD Commits] r7112 - pcbsd/current/pc-sysinstall/backend

[svn at pcbsd.org]

Author: kris
Date: 2010-07-02 10:27:56 -0700 (Fri, 02 Jul 2010)
New Revision: 7112

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

Update pc-sysinstall in current/ fixing issue with ZFS on "/" and using dedicated "/boot" partition on UFS. Don't
need to stamp zfsboot then



Modified: pcbsd/current/pc-sysinstall/backend/functions-newfs.sh
===================================================================
--- pcbsd/current/pc-sysinstall/backend/functions-newfs.sh	2010-07-02 17:26:52 UTC (rev 7111)
+++ pcbsd/current/pc-sysinstall/backend/functions-newfs.sh	2010-07-02 17:27:56 UTC (rev 7112)
@@ -61,6 +61,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
@@ -129,6 +130,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}"
@@ -138,6 +144,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}"
@@ -151,6 +161,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}"