From owner-svn-src-user@FreeBSD.ORG  Tue Jan 22 04:50:22 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 873FEA61;
 Tue, 22 Jan 2013 04:50:22 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6161126F;
 Tue, 22 Jan 2013 04:50:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0M4oMWw010013;
 Tue, 22 Jan 2013 04:50:22 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0M4oM4D010012;
 Tue, 22 Jan 2013 04:50:22 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201301220450.r0M4oM4D010012@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Tue, 22 Jan 2013 04:50:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r245766 - user/hrs/releng/release/sparc64
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Jan 2013 04:50:22 -0000

Author: hrs
Date: Tue Jan 22 04:50:21 2013
New Revision: 245766
URL: http://svnweb.freebsd.org/changeset/base/245766

Log:
  - Remove whitespace before and after braces.
  - Use gpart(8) instead of sunlabel(8).
  
  Suggested by:	marius

Modified:
  user/hrs/releng/release/sparc64/mkisoimages.sh

Modified: user/hrs/releng/release/sparc64/mkisoimages.sh
==============================================================================
--- user/hrs/releng/release/sparc64/mkisoimages.sh	Tue Jan 22 04:14:27 2013	(r245765)
+++ user/hrs/releng/release/sparc64/mkisoimages.sh	Tue Jan 22 04:50:21 2013	(r245766)
@@ -56,15 +56,15 @@ dd if=$4/boot/boot1 of="${BOOTFSIMG}" bs
 # Create a boot ISO image
 : ${CYLSIZE:=640}
 ISOSIZE=$(stat -f %z ${NAME}.tmp)
-ISOBLKS=$(( (${ISOSIZE} + 511) / 512 ))
-ISOCYLS=$(( (${ISOBLKS} + (${CYLSIZE} - 1)) / ${CYLSIZE} ))
+ISOBLKS=$(((${ISOSIZE} + 511) / 512))
+ISOCYLS=$(((${ISOBLKS} + (${CYLSIZE} - 1)) / ${CYLSIZE}))
 
 BOOTFSSIZE=$(stat -f %z "${BOOTFSIMG}")
-BOOTFSBLKS=$(( (${BOOTFSSIZE} + 511) / 512 ))
-BOOTFSCYLS=$(( (${BOOTFSBLKS} + (${CYLSIZE} - 1)) / ${CYLSIZE} ))
+BOOTFSBLKS=$(((${BOOTFSSIZE} + 511) / 512))
+BOOTFSCYLS=$(((${BOOTFSBLKS} + (${CYLSIZE} - 1)) / ${CYLSIZE}))
 
-ENDCYL=$(( ${ISOCYLS} + ${BOOTFSCYLS} ))
-NSECTS=$(( ${ENDCYL} * 1 * ${CYLSIZE} ))
+ENDCYL=$((${ISOCYLS} + ${BOOTFSCYLS}))
+NSECTS=$((${ENDCYL} * 1 * ${CYLSIZE}))
 
 dd if=${NAME}.tmp of=${NAME} bs=${CYLSIZE}b conv=notrunc,sync
 dd if=${BOOTFSIMG} of=${NAME} bs=${CYLSIZE}b seek=${ISOCYLS} conv=notrunc,sync
@@ -73,21 +73,10 @@ dd if=/dev/zero of=${NAME} bs=${CYLSIZE}
 rm -rf ${NAME}.tmp ${TMPIMGDIR}
 
 # Write VTOC8 label to boot ISO image
-MD=`mdconfig -a -t vnode -f ${NAME}`
-cat <<EOT | sunlabel -R ${MD} /dev/stdin
-text: FreeBSD_Install cyl ${ENDCYL} alt 2 hd 1 sec ${CYLSIZE}
-bytes/sector: 512
-sectors/cylinder: ${CYLSIZE}
-sectors/unit: ${NSECTS}
-
-8 partitions:
-#
-# Size is in sectors.
-# Offset is in cylinders.
-#       size            offset          tag             flag
-#       ----------      ----------      ----------      ----
-  c:    *               0               backup          rm
-  a:    ${ISOBLKS}      0               usr             rm
-  f:    ${BOOTFSBLKS}   ${ISOCYLS}      root            rm
-EOT
+MD=`mdconfig -a -t vnode -S 512 -y 1 -x ${CYLSIZE} -f ${NAME}`
+gpart create -s VTOC8 ${MD}
+# !4: usr, for ISO image part
+gpart add -i 1 -s $((${ISOCYLS} * ${CYLSIZE} * 512))b -t \!4 ${MD}
+# !2: root, for bootfs part.
+gpart add -i 6 -s $((${BOOTFSCYLS} * ${CYLSIZE} * 512))b -t \!2 ${MD}
 mdconfig -d -u ${MD#md}