[src/trunk]: src/sbin/gpt Now that GPT_ENT_TYPE_LINUX_DATA is diffrent from t...

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

details:   https://anonhg.NetBSD.org/src/rev/c30837493a24
branches:  trunk
changeset: 784109:c30837493a24
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Fri Jan 18 17:58:15 2013 +0000

description:
Now that GPT_ENT_TYPE_LINUX_DATA is diffrent from the Windows one, use it.

diffstat:

 sbin/gpt/gpt.c  |   4 ++--
 sbin/gpt/show.c |  15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diffs (64 lines):

diff -r b0d90be49a12 -r c30837493a24 sbin/gpt/gpt.c
--- a/sbin/gpt/gpt.c    Fri Jan 18 17:56:11 2013 +0000
+++ b/sbin/gpt/gpt.c    Fri Jan 18 17:58:15 2013 +0000
@@ -31,7 +31,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.17 2012/07/30 00:53:59 matt Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.18 2013/01/18 17:58:15 jakllsch Exp $");
 #endif
 
 #include <sys/param.h>
@@ -328,7 +328,7 @@
                        *uuid = lfs;
                        return (0);
                } else if (strcmp(s, "linux") == 0) {
-                       uuid_t lnx = GPT_ENT_TYPE_MS_BASIC_DATA;
+                       uuid_t lnx = GPT_ENT_TYPE_LINUX_DATA;
                        *uuid = lnx;
                        return (0);
                }
diff -r b0d90be49a12 -r c30837493a24 sbin/gpt/show.c
--- a/sbin/gpt/show.c   Fri Jan 18 17:56:11 2013 +0000
+++ b/sbin/gpt/show.c   Fri Jan 18 17:58:15 2013 +0000
@@ -29,7 +29,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: show.c,v 1.7 2011/08/27 17:38:16 joerg Exp $");
+__RCSID("$NetBSD: show.c,v 1.8 2013/01/18 17:58:15 jakllsch Exp $");
 #endif
 
 #include <sys/types.h>
@@ -63,9 +63,10 @@
 {
        static uuid_t efi_slice = GPT_ENT_TYPE_EFI;
        static uuid_t bios_boot = GPT_ENT_TYPE_BIOS;
-       static uuid_t mslinux = GPT_ENT_TYPE_MS_BASIC_DATA;
+       static uuid_t msdata = GPT_ENT_TYPE_MS_BASIC_DATA;
        static uuid_t freebsd = GPT_ENT_TYPE_FREEBSD;
        static uuid_t hfs = GPT_ENT_TYPE_APPLE_HFS;
+       static uuid_t linuxdata = GPT_ENT_TYPE_LINUX_DATA;
        static uuid_t linuxswap = GPT_ENT_TYPE_LINUX_SWAP;
        static uuid_t msr = GPT_ENT_TYPE_MS_RESERVED;
        static uuid_t swap = GPT_ENT_TYPE_FREEBSD_SWAP;
@@ -108,12 +109,14 @@
 
        if (uuid_equal(t, &freebsd, NULL))
                return ("FreeBSD legacy");
-       if (uuid_equal(t, &mslinux, NULL))
-               return ("Linux/Windows");
+       if (uuid_equal(t, &msdata, NULL))
+               return ("Windows basic data");
+       if (uuid_equal(t, &msr, NULL))
+               return ("Windows reserved");
+       if (uuid_equal(t, &linuxdata, NULL))
+               return ("Linux data");
        if (uuid_equal(t, &linuxswap, NULL))
                return ("Linux swap");
-       if (uuid_equal(t, &msr, NULL))
-               return ("Windows reserved");
        if (uuid_equal(t, &hfs, NULL))
                return ("Apple HFS");