Module Name:    src
Committed By:   jnemeth
Date:           Sat Oct 19 01:58:34 UTC 2013

Modified Files:
        src/sbin/gpt: migrate.c

Log Message:
Add code for detecting FreeBSD ZFS partitions.

XXX  Need to add code for migrating NetBSD disklabel'ed disks.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sbin/gpt/migrate.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sbin/gpt/migrate.c
diff -u src/sbin/gpt/migrate.c:1.7 src/sbin/gpt/migrate.c:1.8
--- src/sbin/gpt/migrate.c:1.7	Sat Apr 13 18:32:01 2013
+++ src/sbin/gpt/migrate.c	Sat Oct 19 01:58:33 2013
@@ -29,7 +29,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/migrate.c,v 1.16 2005/09/01 02:42:52 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: migrate.c,v 1.7 2013/04/13 18:32:01 jakllsch Exp $");
+__RCSID("$NetBSD: migrate.c,v 1.8 2013/10/19 01:58:33 jnemeth Exp $");
 #endif
 
 #include <sys/types.h>
@@ -126,6 +126,13 @@ migrate_disklabel(int fd, off_t start, s
 			    ent->ent_name, 36);
 			break;
 		}
+		case FS_ZFS: {
+			static const uuid_t zfs = GPT_ENT_TYPE_FREEBSD_ZFS;
+			le_uuid_enc(ent->ent_type, &zfs);
+			utf8_to_utf16((const uint8_t *)"FreeBSD ZFS partition",
+			    ent->ent_name, 36);
+			break;
+		}
 		default:
 			warnx("%s: warning: unknown FreeBSD partition (%d)",
 			    device_name, dl->d_partitions[i].p_fstype);

Reply via email to