PERFORCE change 44241 for review

[Chris Vance]

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

Change 44241 by cvance at 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;
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message