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

[svn at pcbsd.org]

Author: kris
Date: 2011-11-08 09:19:44 -0800 (Tue, 08 Nov 2011)
New Revision: 13743

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

Fix up patch for pc-sysinstall after other patches have been committed to stable



Modified: pcbsd/current/build-files/src-patches/patch-pc-sysinstall-bootcamp
===================================================================
--- pcbsd/current/build-files/src-patches/patch-pc-sysinstall-bootcamp	2011-11-08 17:09:13 UTC (rev 13742)
+++ pcbsd/current/build-files/src-patches/patch-pc-sysinstall-bootcamp	2011-11-08 17:19:44 UTC (rev 13743)
@@ -1,6 +1,6 @@
 Index: usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
 ===================================================================
---- usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh	(revision 226590)
+--- usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh	(revision 227343)
 +++ usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh	(working copy)
 @@ -179,7 +179,9 @@
    else
@@ -33,15 +33,7 @@
  
          if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" -a "${FS}" != "UFS+SUJ" ] ; then
            exit_err "/boot partition must be formatted with UFS"
-@@ -280,14 +288,14 @@
-       if [ "${_pType}" = "gpt" ] ; then
-         get_fs_line_xvars "${_pDisk}p${CURPART}" "${STRING}"
-       else
--        get_fs_line_xvars "${_wSlice}" "${STRING}"
-+        get_fs_line_xvars "${_wSlice}${PARTLETTER}" "${STRING}"
-       fi
-       XTRAOPTS="${VAR}"
- 
+@@ -287,7 +295,7 @@
        # Check if using zfs mirror
        echo ${XTRAOPTS} | grep -q "mirror" 2>/dev/null
        if [ $? -eq 0 -a "$FS" = "ZFS" ] ; then
@@ -98,19 +90,9 @@
    # Setup some files which we'll be referring to
 Index: usr.sbin/pc-sysinstall/backend/functions-disk.sh
 ===================================================================
---- usr.sbin/pc-sysinstall/backend/functions-disk.sh	(revision 226590)
+--- usr.sbin/pc-sysinstall/backend/functions-disk.sh	(revision 227343)
 +++ usr.sbin/pc-sysinstall/backend/functions-disk.sh	(working copy)
-@@ -470,7 +470,8 @@
-               # Default to round-robin if the user didn't specify
-               if [ -z "$MIRRORBAL" ]; then MIRRORBAL="round-robin" ; fi
- 
--              echo "$MIRRORDISK:$MIRRORBAL:gm${gmnum}" >${MIRRORCFGDIR}/$DISK
-+	      _mFile=`echo $DISK | sed 's|/|%|g'`
-+              echo "$MIRRORDISK:$MIRRORBAL:gm${gmnum}" >${MIRRORCFGDIR}/$_mFile
- 	      init_gmirror "$gmnum" "$MIRRORBAL" "$DISK" "$MIRRORDISK"
- 
- 	      # Reset DISK to the gmirror device
-@@ -495,6 +496,13 @@
+@@ -496,6 +496,13 @@
              run_gpart_slice "${DISK}" "${BMANAGER}" "${s}"
              ;;
  
@@ -124,7 +106,7 @@
            free)
              tmpSLICE="${DISK}s${LASTSLICE}"
              run_gpart_free "${DISK}" "${LASTSLICE}" "${BMANAGER}"
-@@ -703,6 +711,58 @@
+@@ -704,6 +711,58 @@
    fi
  };
  
@@ -185,7 +167,7 @@
  {
 Index: usr.sbin/pc-sysinstall/backend/parseconfig.sh
 ===================================================================
---- usr.sbin/pc-sysinstall/backend/parseconfig.sh	(revision 226590)
+--- usr.sbin/pc-sysinstall/backend/parseconfig.sh	(revision 227343)
 +++ usr.sbin/pc-sysinstall/backend/parseconfig.sh	(working copy)
 @@ -70,7 +70,6 @@
  check_value installType "PCBSD FreeBSD"