svn commit: r219823 - in head/tools/tools/nanobsd/rescue: . Files/root

[Michael Reifenberger]

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 at 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}