Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

we want the label name not the fstype name.

This commit is contained in:
christos 2012-01-05 22:18:36 +00:00
parent e7e44ea620
commit c9ef664a0f
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/utils/sysinst/defs.h
View File

@ -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)
{

13
distrib/utils/sysinst/disks.c
View File

@ -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 char *, char);
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 *arg)
else
desc = "FFSv1";
else
desc = getfstypename(p->pi_fstype);
desc = getfslabelname(p->pi_fstype);
#ifdef PART_BOOT
if (ptn == PART_BOOT)

8
distrib/utils/sysinst/label.c
View File

@ -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 *arg)
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:

8
distrib/utils/sysinst/savenewlabel.c
View File

@ -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);