From owner-svn-src-all@FreeBSD.ORG  Mon Mar 21 13:23:26 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2242A1065672;
	Mon, 21 Mar 2011 13:23:26 +0000 (UTC) (envelope-from mr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 136538FC1C;
	Mon, 21 Mar 2011 13:23:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2LDNPJf006103;
	Mon, 21 Mar 2011 13:23:25 GMT (envelope-from mr@svn.freebsd.org)
Received: (from mr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2LDNPvD006100;
	Mon, 21 Mar 2011 13:23:25 GMT (envelope-from mr@svn.freebsd.org)
Message-Id: <201103211323.p2LDNPvD006100@svn.freebsd.org>
From: Michael Reifenberger <mr@FreeBSD.org>
Date: Mon, 21 Mar 2011 13:23:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219823 - in head/tools/tools/nanobsd/rescue: .
	Files/root
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Mar 2011 13:23:26 -0000

Author: mr
Date: Mon Mar 21 13:23:25 2011
New Revision: 219823
URL: http://svn.freebsd.org/changeset/base/219823

Log:
  Delete all GPT partitions at once. (Suggested by Andrey V. Elsukov <bu7cher@yandex.ru>)
  Fix amd64 merge script.

Modified:
  head/tools/tools/nanobsd/rescue/Files/root/GPT4ZFS_Create.sh
  head/tools/tools/nanobsd/rescue/merge.sh

Modified: head/tools/tools/nanobsd/rescue/Files/root/GPT4ZFS_Create.sh
==============================================================================
--- head/tools/tools/nanobsd/rescue/Files/root/GPT4ZFS_Create.sh	Mon Mar 21 12:51:13 2011	(r219822)
+++ head/tools/tools/nanobsd/rescue/Files/root/GPT4ZFS_Create.sh	Mon Mar 21 13:23:25 2011	(r219823)
@@ -25,10 +25,7 @@ shift; while getopts :s:z: arg; do case 
   #?) exerr ${usage};;                                                                                                      
 esac; done; shift $(( ${OPTIND} - 1 ))                                                                                                
  
-gpart delete -i 3 $dsk
-gpart delete -i 2 $dsk
-gpart delete -i 1 $dsk
-gpart destroy $dsk
+gpart destroy -F $dsk
 gpart create -s gpt $dsk
 
 # Boot

Modified: head/tools/tools/nanobsd/rescue/merge.sh
==============================================================================
--- head/tools/tools/nanobsd/rescue/merge.sh	Mon Mar 21 12:51:13 2011	(r219822)
+++ head/tools/tools/nanobsd/rescue/merge.sh	Mon Mar 21 13:23:25 2011	(r219823)
@@ -7,5 +7,12 @@ D2="/usr/obj/nanobsd.rescue_amd64"
 MD=`mdconfig -a -t vnode -f ${D1}/_.disk.full`
 
 dd if=${D2}/_.disk.image of=/dev/${MD}s2 bs=128k
+tunefs -L rescues2a /dev/${MD}s2a
+mount /dev/${MD}s2a ${D1}/_.mnt
+
+sed -i "" -e 's/rescues1/rescues2/' ${D1}/_.mnt/conf/base/etc/fstab
+sed -i "" -e 's/rescues1/rescues2/' ${D1}/_.mnt/etc/fstab
+
+umount ${D1}/_.mnt
 
 mdconfig -d -u ${MD}