[PC-BSD Commits] r13502 - pcbsd/current/build-files/src-patches

[svn at pcbsd.org]

Author: kris
Date: 2011-10-25 05:22:10 -0700 (Tue, 25 Oct 2011)
New Revision: 13502

Modified:
   pcbsd/current/build-files/src-patches/patch-pc-sysinstall-bootcamp
Log:

Update the bootcamp patch, doesn't need bsdlabel anymore




Modified: pcbsd/current/build-files/src-patches/patch-pc-sysinstall-bootcamp
===================================================================
--- pcbsd/current/build-files/src-patches/patch-pc-sysinstall-bootcamp	2011-10-25 09:06:56 UTC (rev 13501)
+++ pcbsd/current/build-files/src-patches/patch-pc-sysinstall-bootcamp	2011-10-25 12:22:10 UTC (rev 13502)
@@ -50,17 +50,25 @@
         	  XTRAOPTS=$(setup_zfs_mirror_parts "$XTRAOPTS" "${_pDisk}p${CURPART}")
          else
         	  XTRAOPTS=$(setup_zfs_mirror_parts "$XTRAOPTS" "${_wSlice}")
-@@ -309,6 +317,9 @@
+@@ -305,11 +313,17 @@
+       if [ "${_pType}" = "gpt" ] ; then
+ 	if [ "$CURPART" = "2" ] ; then
+ 	  # If this is GPT, make sure first partition is aligned to 4k
++          sleep 2
+           rc_halt "gpart add -b 2016 ${SOUT} -t ${PARTYPE} ${_pDisk}"
  	else
++          sleep 2
            rc_halt "gpart add ${SOUT} -t ${PARTYPE} ${_pDisk}"
  	fi
 +      elif [ "${_pType}" = "gptslice" ]; then
 +        sleep 2
 +        rc_halt "gpart add ${SOUT} -t ${PARTYPE} ${_wSlice}"
        else
++        sleep 2
          rc_halt "gpart add ${SOUT} -t ${PARTYPE} -i ${CURPART} ${_wSlice}"
        fi
-@@ -338,7 +349,7 @@
+ 
+@@ -338,7 +352,7 @@
            echo "${ENCPASS}" >${PARTDIR}-enc/${_dFile}p${CURPART}-encpass
          fi
        else
@@ -69,7 +77,7 @@
  	_dFile="`echo $_wSlice | sed 's|/|-|g'`"
          echo "${FS}:${MNT}:${ENC}:${PLABEL}:MBR:${XTRAOPTS}:${IMAGE}" >${PARTDIR}/${_dFile}${PARTLETTER}
          # Clear out any headers
-@@ -422,7 +433,7 @@
+@@ -422,7 +436,7 @@
    if [ "$type" = "mbr" ] ; then
      wrkslice="${diskid}s${slicenum}"
    fi
@@ -78,7 +86,7 @@
      wrkslice="${diskid}p${slicenum}"
    fi
  
-@@ -459,6 +470,9 @@
+@@ -459,6 +473,9 @@
      if [ "$type" = "gpt" -a ! -e "${disk}p${pnum}" ] ; then
        exit_err "ERROR: The partition ${i} doesn't exist! gpart failure!"
      fi
@@ -116,7 +124,7 @@
            free)
              tmpSLICE="${DISK}s${LASTSLICE}"
              run_gpart_free "${DISK}" "${LASTSLICE}" "${BMANAGER}"
-@@ -703,6 +711,59 @@
+@@ -703,6 +711,58 @@
    fi
  };
  
@@ -153,11 +161,10 @@
 +  echo_log "Cleaning up $slice"
 +  rc_halt "dd if=/dev/zero of=${DISK}p${slicenum} count=1024"
 +
-+  sleep 1
++  sleep 4
 +
-+  # Create a bogus bsdlabel and remove the first partition
-+  rc_halt "bsdlabel -w -B ${DISK}p${slicenum}"
-+  rc_halt "gpart delete -i 1 ${DISK}p${slicenum}"
++  # Init the MBR partition
++  rc_halt "gpart create -s BSD ${DISK}p${slicenum}"
 +
 +  # Set the slice to the format we'll be using for gpart later
 +  slice=`echo "${1}:${3}:gptslice" | sed 's|/|-|g'`