Correctly skip the '/dev/' part when creating new drives and prefix

a drive's provider with '/dev/' when printing the config.

Reported by:  will@

2 files changed, 8 insertions, 5 deletions

diff --git a/sys/geom/vinum/geom_vinum_share.c b/sys/geom/vinum/geom_vinum_share.c
index 5cb4dab..2b572c3 100644
--- a/sys/geom/vinum/geom_vinum_share.c
+++ b/sys/geom/vinum/geom_vinum_share.c
@@ -402,10 +402,13 @@ gv_new_drive(int max, char *token[])
 				errors++;
 				break;
 			}
-			ptr = token[j] + strlen(token[j]);
-			while (ptr != token[j] && *ptr != '/')
-				ptr--;
-			ptr++;
+			ptr = token[j];
+			if (*ptr == '/') {
+				ptr++;
+				while (*ptr != '/')
+					ptr++;
+				ptr++;
+			}
 			strncpy(d->device, ptr, GV_MAXDRIVENAME);
 		} else {
 			/* We assume this is the drive name. */
diff --git a/sys/geom/vinum/geom_vinum_subr.c b/sys/geom/vinum/geom_vinum_subr.c
index 8ebe135..1821cfd 100644
--- a/sys/geom/vinum/geom_vinum_subr.c
+++ b/sys/geom/vinum/geom_vinum_subr.c
@@ -189,7 +189,7 @@ gv_format_config(struct gv_softc *sc, struct sbuf *sb, int ondisk, char *prefix)
 	 */
 	if (!ondisk) {
 		LIST_FOREACH(d, &sc->drives, drive) {
-			sbuf_printf(sb, "%sdrive %s device %s\n", prefix,
+			sbuf_printf(sb, "%sdrive %s device /dev/%s\n", prefix,
 			    d->name, d->device);
 		}
 	}