diff options
author | marcel <marcel@FreeBSD.org> | 2008-04-23 03:00:26 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 2008-04-23 03:00:26 +0000 |
commit | ed972f84a308c6b3fe2df89ac3a612e317459aa3 (patch) | |
tree | fe48366b2fca158524f6e7293f29688dff815c43 /lib/libdisk | |
parent | cab3742f107c2ffe5e778a8fc08b3070278fe4ac (diff) | |
download | FreeBSD-src-ed972f84a308c6b3fe2df89ac3a612e317459aa3.zip FreeBSD-src-ed972f84a308c6b3fe2df89ac3a612e317459aa3.tar.gz |
Correct an off-by-1 for GPART. The literal partition type (i.e.
the actual UUID) is prefixed by '!' to distinguish them from
well-known aliases.
MFC after: 3 days
Diffstat (limited to 'lib/libdisk')
-rw-r--r-- | lib/libdisk/open_ia64_disk.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/libdisk/open_ia64_disk.c b/lib/libdisk/open_ia64_disk.c index bd28c7a..aeac7c8 100644 --- a/lib/libdisk/open_ia64_disk.c +++ b/lib/libdisk/open_ia64_disk.c @@ -217,8 +217,14 @@ Int_Open_Disk(const char *name, char *conftxt) uuid = _swap; else if (!strcmp(r, "freebsd-ufs")) uuid = _ufs; - else - uuid_from_string(r, &uuid, &status); + else { + if (!strcmp(type, "PART")) + uuid_from_string(r + 1, &uuid, + &status); + else + uuid_from_string(r, &uuid, + &status); + } } else status = uuid_s_invalid_string_uuid; if (!strcmp(q, "o")) |