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

[svn at pcbsd.org]

Author: kris
Date: 2011-09-23 07:03:53 -0700 (Fri, 23 Sep 2011)
New Revision: 12965

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

Fix up the patch for gmirror support



Modified: pcbsd/current/build-files/src-patches/patch-pc-sysinstall-gmirror-bugfix
===================================================================
--- pcbsd/current/build-files/src-patches/patch-pc-sysinstall-gmirror-bugfix	2011-09-23 13:39:11 UTC (rev 12964)
+++ pcbsd/current/build-files/src-patches/patch-pc-sysinstall-gmirror-bugfix	2011-09-23 14:03:53 UTC (rev 12965)
@@ -1,13 +1,36 @@
-Index: usr.sbin/pc-sysinstall/backend/functions-disk.sh
+Index:  usr.sbin/pc-sysinstall/backend/functions-unmount.sh
 ===================================================================
---- usr.sbin/pc-sysinstall/backend/functions-disk.sh	(revision 225448)
-+++ usr.sbin/pc-sysinstall/backend/functions-disk.sh	(working copy)
-@@ -554,7 +554,7 @@
-     local _mDisk=$3
+---  usr.sbin/pc-sysinstall/backend/functions-unmount.sh	(revision 225739)
++++  usr.sbin/pc-sysinstall/backend/functions-unmount.sh	(working copy)
+@@ -43,7 +43,7 @@
+ {
  
-     # Create this mirror device
--    rc_halt "gmirror label -vb ${_mBal} gm${_mNum} /dev/${_mDisk}"
-+    rc_halt "gmirror label -vb ${_mBal} gm${_mNum} ${_mDisk}"
+   cd ${MIRRORCFGDIR}
+-  for DISK in `ls *`
++  for DISK in `ls ${MIRRORCFGDIR}`
+   do
+     MIRRORDISK="`cat ${DISK} | cut -d ':' -f 1`"
+     MIRRORBAL="`cat ${DISK} | cut -d ':' -f 2`"
+@@ -51,7 +51,7 @@
+    
+     # Start the mirroring service
+     rc_nohalt "gmirror forget ${MIRRORNAME}"
+-    rc_halt "gmirror insert ${MIRRORNAME} /dev/${MIRRORDISK}"
++    rc_halt "gmirror insert ${MIRRORNAME} ${MIRRORDISK}"
  
-     sleep 3
+   done
  
+Index:  usr.sbin/pc-sysinstall/backend/functions-disk.sh
+===================================================================
+---  usr.sbin/pc-sysinstall/backend/functions-disk.sh	(revision 225739)
++++  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