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

[svn at pcbsd.org]

Author: kris
Date: 2012-11-10 17:54:31 +0000 (Sat, 10 Nov 2012)
New Revision: 20155

Modified:
   pcbsd/current/build-files/src-patches/patch-pc-sysinstall-zpool-4k-gnop
Log:

Fix pc-sysinstall gnop trick to not complain about the ZFS device name
being changed when we destroy the gnop device



Modified: pcbsd/current/build-files/src-patches/patch-pc-sysinstall-zpool-4k-gnop
===================================================================
--- pcbsd/current/build-files/src-patches/patch-pc-sysinstall-zpool-4k-gnop	2012-11-10 17:13:33 UTC (rev 20154)
+++ pcbsd/current/build-files/src-patches/patch-pc-sysinstall-zpool-4k-gnop	2012-11-10 17:54:31 UTC (rev 20155)
@@ -1,6 +1,40 @@
+Index: usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh
+===================================================================
+--- usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh	(revision 242874)
++++ usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh	(working copy)
+@@ -149,12 +149,12 @@
+   for PART in `ls ${PARTDIR}`
+   do
+     PARTDEV=`echo $PART | sed 's|-|/|g'` 
+-    if [ ! -e "${PARTDEV}" ]
++    PARTFS="`cat ${PARTDIR}/${PART} | cut -d '#' -f 1`"
++    if [ ! -e "${PARTDEV}" -a "${PARTFS}" != "ZFS" ]
+     then
+       exit_err "ERROR: The partition ${PARTDEV} does not exist. Failure in bsdlabel?"
+     fi 
+ 
+-    PARTFS="`cat ${PARTDIR}/${PART} | cut -d '#' -f 1`"
+     PARTMNT="`cat ${PARTDIR}/${PART} | cut -d '#' -f 2`"
+     PARTENC="`cat ${PARTDIR}/${PART} | cut -d '#' -f 3`"
+ 
+@@ -186,12 +186,12 @@
+   for PART in `ls ${PARTDIR}`
+   do
+     PARTDEV=`echo $PART | sed 's|-|/|g'`
+-    if [ ! -e "${PARTDEV}" ]
++    PARTFS="`cat ${PARTDIR}/${PART} | cut -d '#' -f 1`"
++    if [ ! -e "${PARTDEV}" -a "${PARTFS}" != "ZFS" ]
+     then
+       exit_err "ERROR: The partition ${PARTDEV} does not exist. Failure in bsdlabel?"
+     fi 
+      
+-    PARTFS="`cat ${PARTDIR}/${PART} | cut -d '#' -f 1`"
+     PARTMNT="`cat ${PARTDIR}/${PART} | cut -d '#' -f 2`"
+     PARTENC="`cat ${PARTDIR}/${PART} | cut -d '#' -f 3`"
+ 
 Index: usr.sbin/pc-sysinstall/backend/functions-newfs.sh
 ===================================================================
---- usr.sbin/pc-sysinstall/backend/functions-newfs.sh	(revision 242702)
+--- usr.sbin/pc-sysinstall/backend/functions-newfs.sh	(revision 242874)
 +++ usr.sbin/pc-sysinstall/backend/functions-newfs.sh	(working copy)
 @@ -60,18 +60,28 @@
      fi
@@ -35,7 +69,7 @@
  # Runs newfs on all the partiions which we've setup with bsdlabel
 Index: usr.sbin/pc-sysinstall/backend/functions.sh
 ===================================================================
---- usr.sbin/pc-sysinstall/backend/functions.sh	(revision 242702)
+--- usr.sbin/pc-sysinstall/backend/functions.sh	(revision 242874)
 +++ usr.sbin/pc-sysinstall/backend/functions.sh	(working copy)
 @@ -277,7 +277,11 @@
      while :
@@ -52,7 +86,7 @@
  
 Index: usr.sbin/pc-sysinstall/conf/pc-sysinstall.conf
 ===================================================================
---- usr.sbin/pc-sysinstall/conf/pc-sysinstall.conf	(revision 242702)
+--- usr.sbin/pc-sysinstall/conf/pc-sysinstall.conf	(revision 242874)
 +++ usr.sbin/pc-sysinstall/conf/pc-sysinstall.conf	(working copy)
 @@ -5,11 +5,9 @@
  TMPDIR="/tmp/.pc-sysinstall"