From owner-svn-src-all@FreeBSD.ORG  Sun Mar 20 12:40:18 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 018D5106566C;
	Sun, 20 Mar 2011 12:40:18 +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 CB3EF8FC08;
	Sun, 20 Mar 2011 12:40:17 +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 p2KCeHh5079048;
	Sun, 20 Mar 2011 12:40:17 GMT (envelope-from mr@svn.freebsd.org)
Received: (from mr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2KCeHmD079045;
	Sun, 20 Mar 2011 12:40:17 GMT (envelope-from mr@svn.freebsd.org)
Message-Id: <201103201240.p2KCeHmD079045@svn.freebsd.org>
From: Michael Reifenberger <mr@FreeBSD.org>
Date: Sun, 20 Mar 2011 12:40:17 +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: r219798 - 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: Sun, 20 Mar 2011 12:40:18 -0000

Author: mr
Date: Sun Mar 20 12:40:17 2011
New Revision: 219798
URL: http://svn.freebsd.org/changeset/base/219798

Log:
  - Add script for preparing disks in GPT/ZFS boot environment
  - Add merge script for integrating amd64 slice into i386 disk image

Added:
  head/tools/tools/nanobsd/rescue/Files/root/GPT4ZFS_Create.sh   (contents, props changed)
  head/tools/tools/nanobsd/rescue/merge.sh   (contents, props changed)

Added: head/tools/tools/nanobsd/rescue/Files/root/GPT4ZFS_Create.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/tools/nanobsd/rescue/Files/root/GPT4ZFS_Create.sh	Sun Mar 20 12:40:17 2011	(r219798)
@@ -0,0 +1,53 @@
+#!/bin/sh
+# $FreeBSD$
+
+# some default sizes
+align=2048
+swapsize=$(expr 1 \* 1024 \* 2048 + 1024)
+zfssize=0
+
+# define our bail out shortcut
+exerr () { echo -e "$*" >&2 ; exit 1; }
+
+usage="Usage: $0 <dsk> [ -s <swap size> ] [ -z <zfs size> ]\n\
+	\tswap size: if no -s size in blocks is given, default is $swapsize blocks\n\
+	\tzfs size: if no -z size in blocks is given, default is the rest of the disk"
+
+dsk=$1
+if [ -z "$dsk" -o \! -c "/dev/$dsk" ]; then
+  exerr ${usage};
+  exit;
+fi
+
+shift; while getopts :s:z: arg; do case ${arg} in
+  s) swapsize=${OPTARG};;
+  z) zfssize=${OPTARG};;                                                                                                               
+  #?) 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 create -s gpt $dsk
+
+# Boot
+siz=$(expr 1024 \- 34)
+gpart add -i 1 -b 34 -s $siz -t freebsd-boot $dsk
+gpart bootcode -b /boot/pmbr -p /boot/gptzfsboot -i 1 $dsk
+
+# Swap
+off=$align
+siz=$swapsize
+gpart add -i 2 -b $off -s $siz -t freebsd-swap $dsk
+
+# ZFS
+off=$(expr $align + $swapsize)
+if [ "$zfssize" -gt 0 ]; then
+  siz="-s $zfssize"
+else
+  siz=""
+fi
+gpart add -i 3 -b $off $siz -t freebsd-zfs $dsk
+
+gpart show $dsk

Added: head/tools/tools/nanobsd/rescue/merge.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/tools/nanobsd/rescue/merge.sh	Sun Mar 20 12:40:17 2011	(r219798)
@@ -0,0 +1,11 @@
+#!/bin/sh
+# $FreeBSD$
+
+D1="/usr/obj/nanobsd.rescue_i386"
+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
+
+mdconfig -d -u ${MD}