[src/trunk]: src/sbin/gpt using random values for hdr->hdr_guid does not work...

[jnemeth <jnemeth%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/39e0adb20201
branches:  trunk
changeset: 802764:39e0adb20201
user:      jnemeth <jnemeth%NetBSD.org@localhost>
date:      Wed Oct 01 01:08:25 2014 +0000

description:
using random values for hdr->hdr_guid does not work very well

diffstat:

 sbin/gpt/restore.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r fe46ac182786 -r 39e0adb20201 sbin/gpt/restore.c
--- a/sbin/gpt/restore.c        Wed Oct 01 01:07:24 2014 +0000
+++ b/sbin/gpt/restore.c        Wed Oct 01 01:08:25 2014 +0000
@@ -33,7 +33,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/create.c,v 1.11 2005/08/31 01:47:19 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: restore.c,v 1.6 2014/09/30 17:59:59 christos Exp $");
+__RCSID("$NetBSD: restore.c,v 1.7 2014/10/01 01:08:25 jnemeth Exp $");
 #endif
 
 #include <sys/types.h>
@@ -72,7 +72,7 @@
 static void
 restore(int fd)
 {
-       gpt_uuid_t uuid;
+       gpt_uuid_t gpt_guid, uuid;
        off_t firstdata, last, lastdata, gpe_start, gpe_end;
        map_t *map;
        struct mbr *mbr;
@@ -145,7 +145,7 @@
        propstr = prop_dictionary_get(gpt_dict, "guid");
        PROP_ERR(propstr);
        s = prop_string_cstring_nocopy(propstr);
-       if (gpt_uuid_parse(s, uuid) != 0) {
+       if (gpt_uuid_parse(s, gpt_guid) != 0) {
                warnx("%s: not able to convert to an UUID\n", s);
                return;
        }
@@ -355,7 +355,7 @@
        hdr->hdr_lba_alt = htole64(last);
        hdr->hdr_lba_start = htole64(firstdata);
        hdr->hdr_lba_end = htole64(lastdata);
-       gpt_uuid_copy(hdr->hdr_guid, uuid);
+       gpt_uuid_copy(hdr->hdr_guid, gpt_guid);
        hdr->hdr_lba_table = htole64(2);
        hdr->hdr_entries = htole32(entries);
        hdr->hdr_entsz = htole32(sizeof(struct gpt_ent));