diff options
author | ae <ae@FreeBSD.org> | 2011-11-06 20:32:55 +0000 |
---|---|---|
committer | ae <ae@FreeBSD.org> | 2011-11-06 20:32:55 +0000 |
commit | 92dbb9bc84169ae2236294dd9ce61abcd91b6e55 (patch) | |
tree | 036e48c8d9b9b9ff10d3ec675e84d7deb1f4c835 /sbin | |
parent | b57deea6eb18ec218ca0abae94f25fc951fa7a7a (diff) | |
download | FreeBSD-src-92dbb9bc84169ae2236294dd9ce61abcd91b6e55.zip FreeBSD-src-92dbb9bc84169ae2236294dd9ce61abcd91b6e55.tar.gz |
Add recommendation to use gpart(8) when user tries write disklabel
or bootcode to already opened provider.
MFC after: 1 week
Diffstat (limited to 'sbin')
-rw-r--r-- | sbin/bsdlabel/bsdlabel.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index 50f5769..6a5eeff 100644 --- a/sbin/bsdlabel/bsdlabel.c +++ b/sbin/bsdlabel/bsdlabel.c @@ -80,7 +80,7 @@ __FBSDID("$FreeBSD$"); #include "pathnames.h" static void makelabel(const char *, struct disklabel *); -static int geom_bsd_available(void); +static int geom_class_available(const char *); static int writelabel(void); static int readlabel(int flag); static void display(FILE *, const struct disklabel *); @@ -355,7 +355,7 @@ readboot(void) } static int -geom_bsd_available(void) +geom_class_available(const char *name) { struct gclass *class; struct gmesh mesh; @@ -366,7 +366,7 @@ geom_bsd_available(void) errc(1, error, "Cannot get GEOM tree"); LIST_FOREACH(class, &mesh.lg_class, lg_class) { - if (strcmp(class->lg_name, "BSD") == 0) { + if (strcmp(class->lg_name, name) == 0) { geom_deletetree(&mesh); return (1); } @@ -411,8 +411,19 @@ writelabel(void) } else serrno = errno; + if (geom_class_available("PART") != 0) { + /* Since we weren't able open provider for + * writing, then recommend user to use gpart(8). + */ + warnc(serrno, + "cannot open provider %s for writing label", + specname); + warnx("Try to use gpart(8)."); + return (1); + } + /* Give up if GEOM_BSD is not available. */ - if (geom_bsd_available() == 0) { + if (geom_class_available("BSD") == 0) { warnc(serrno, "%s", specname); return (1); } |