Module Name: src
Committed By: christos
Date: Thu Jan 5 22:18:36 UTC 2012
Modified Files:
src/distrib/utils/sysinst: defs.h disks.c label.c savenewlabel.c
Log Message:
we want the label name not the fstype name.
To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.121 -r1.122 src/distrib/utils/sysinst/disks.c
cvs rdiff -u -r1.60 -r1.61 src/distrib/utils/sysinst/label.c
cvs rdiff -u -r1.11 -r1.12 src/distrib/utils/sysinst/savenewlabel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.159 src/distrib/utils/sysinst/defs.h:1.160
--- src/distrib/utils/sysinst/defs.h:1.159 Thu Jan 5 16:29:24 2012
+++ src/distrib/utils/sysinst/defs.h Thu Jan 5 17:18:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.159 2012/01/05 21:29:24 christos Exp $ */
+/* $NetBSD: defs.h,v 1.160 2012/01/05 22:18:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -41,6 +41,8 @@
#include <sys/types.h>
#include <sys/disklabel.h>
+const char *getfslabelname(uint8_t);
+
static inline void *
deconst(const void *p)
{
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.121 src/distrib/utils/sysinst/disks.c:1.122
--- src/distrib/utils/sysinst/disks.c:1.121 Thu Jan 5 16:29:24 2012
+++ src/distrib/utils/sysinst/disks.c Thu Jan 5 17:18:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.121 2012/01/05 21:29:24 christos Exp $ */
+/* $NetBSD: disks.c,v 1.122 2012/01/05 22:18:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -46,6 +46,7 @@
#include <sys/swap.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
+#define FSTYPENAMES
#include <sys/disklabel.h>
#include <dev/scsipi/scsipi_all.h>
@@ -87,6 +88,14 @@ static void fixsb(const char *, const ch
static const char *disk_names[] = { DISK_NAMES, "vnd", NULL };
+const char *
+getfslabelname(uint8_t f)
+{
+ if (f >= __arraycount(fstypenames) || fstypenames[f] == NULL)
+ return "invalid";
+ return fstypenames[f];
+}
+
/* from src/sbin/atactl/atactl.c
* extract_string: copy a block of bytes out of ataparams and make
* a proper string out of it, truncating trailing spaces and preserving
@@ -455,7 +464,7 @@ fmt_fspart(menudesc *m, int ptn, void *a
else
desc = "FFSv1";
else
- desc = getfstypename(p->pi_fstype);
+ desc = getfslabelname(p->pi_fstype);
#ifdef PART_BOOT
if (ptn == PART_BOOT)
Index: src/distrib/utils/sysinst/label.c
diff -u src/distrib/utils/sysinst/label.c:1.60 src/distrib/utils/sysinst/label.c:1.61
--- src/distrib/utils/sysinst/label.c:1.60 Thu Jan 5 15:22:33 2012
+++ src/distrib/utils/sysinst/label.c Thu Jan 5 17:18:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.60 2012/01/05 20:22:33 christos Exp $ */
+/* $NetBSD: label.c,v 1.61 2012/01/05 22:18:36 christos Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.60 2012/01/05 20:22:33 christos Exp $");
+__RCSID("$NetBSD: label.c,v 1.61 2012/01/05 22:18:36 christos Exp $");
#endif
#include <sys/types.h>
@@ -387,7 +387,7 @@ edit_ptn(menudesc *menu, void *arg)
if (all_fstype_menu == -1) {
for (i = 0; i < nelem(all_fstypes); i++) {
- all_fstypes[i].opt_name = getfstypename(i);
+ all_fstypes[i].opt_name = getfslabelname(i);
all_fstypes[i].opt_menu = OPT_NOMENU;
all_fstypes[i].opt_flags = 0;
all_fstypes[i].opt_action = set_fstype;
@@ -487,7 +487,7 @@ set_ptn_label(menudesc *m, int opt, void
else
c = "FFSv1";
else
- c = getfstypename(p->pi_fstype);
+ c = getfslabelname(p->pi_fstype);
wprintw(m->mw, msg_string(MSG_fstype_fmt), c);
break;
case PTN_MENU_START:
Index: src/distrib/utils/sysinst/savenewlabel.c
diff -u src/distrib/utils/sysinst/savenewlabel.c:1.11 src/distrib/utils/sysinst/savenewlabel.c:1.12
--- src/distrib/utils/sysinst/savenewlabel.c:1.11 Thu Jan 5 16:29:25 2012
+++ src/distrib/utils/sysinst/savenewlabel.c Thu Jan 5 17:18:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: savenewlabel.c,v 1.11 2012/01/05 21:29:25 christos Exp $ */
+/* $NetBSD: savenewlabel.c,v 1.12 2012/01/05 22:18:36 christos Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: savenewlabel.c,v 1.11 2012/01/05 21:29:25 christos Exp $");
+__RCSID("$NetBSD: savenewlabel.c,v 1.12 2012/01/05 22:18:36 christos Exp $");
#endif
#include <sys/types.h>
@@ -94,10 +94,10 @@ savenewlabel(partinfo *lp, int nparts)
scripting_fprintf(f, "\t:p%c#%" PRIu32 ":o%c#%" PRIu32
":t%c=%s:", 'a'+i, (uint32_t)bsdlabel[i].pi_size,
'a'+i, (uint32_t)bsdlabel[i].pi_offset, 'a'+i,
- getfstypename(bsdlabel[i].pi_fstype));
+ getfslabelname(bsdlabel[i].pi_fstype));
if (PI_ISBSDFS(&bsdlabel[i]))
scripting_fprintf (f, "b%c#%" PRIu32 ":f%c#%" PRIu32
- ":ta=4.2BSD:", 'a'+i,
+ ":", 'a'+i,
(uint32_t)(bsdlabel[i].pi_fsize *
bsdlabel[i].pi_frag),
'a'+i, (uint32_t)bsdlabel[i].pi_fsize);
