From owner-p4-projects@FreeBSD.ORG  Tue Dec 23 06:13:50 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0A1AF16A4D0; Tue, 23 Dec 2003 06:13:50 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D8A1A16A4CE
	for <perforce@freebsd.org>; Tue, 23 Dec 2003 06:13:49 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D0F9543D39
	for <perforce@freebsd.org>; Tue, 23 Dec 2003 06:13:48 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBNEDm0B010237
	for <perforce@freebsd.org>; Tue, 23 Dec 2003 06:13:48 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBNEDmuA010234
	for perforce@freebsd.org; Tue, 23 Dec 2003 06:13:48 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Date: Tue, 23 Dec 2003 06:13:48 -0800 (PST)
Message-Id: <200312231413.hBNEDmuA010234@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 44241 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Dec 2003 14:13:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=44241

Change 44241 by cvance@cvance_sony on 2003/12/23 06:13:18

	Integ from MAC branch.  Allow sysinstall to have correct partition 
	names.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/lib/libdisk/create_chunk.c#5 integrate
.. //depot/projects/trustedbsd/sebsd/lib/libdisk/write_ia64_disk.c#5 integrate

Differences ...

==== //depot/projects/trustedbsd/sebsd/lib/libdisk/create_chunk.c#5 (text+ko) ====

@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.82 2003/11/02 08:39:08 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.83 2003/11/12 17:44:37 marcel Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -159,8 +159,12 @@
 		max = NDOSPART;
 #endif
 		for (j = 1; j <= max; j++) {
+#ifdef __ia64__
 			sprintf(c2->oname, "%s%c%d", c1->name,
 			    (c1->type == whole) ? 'p' : 's', j);
+#else
+			sprintf(c2->oname, "%ss%d", c1->name, j);
+#endif
 			for (c3 = c1->part; c3; c3 = c3->next)
 				if (c3 != c2 && !strcmp(c3->name, c2->oname))
 					goto match;

==== //depot/projects/trustedbsd/sebsd/lib/libdisk/write_ia64_disk.c#5 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/write_ia64_disk.c,v 1.12 2003/11/04 03:49:01 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_ia64_disk.c,v 1.13 2003/11/17 05:47:42 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/disklabel.h>
@@ -98,7 +98,7 @@
 	0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
 };
 
-uint32_t
+static uint32_t
 crc32(const void *buf, size_t size)
 {
 	const uint8_t *p;