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

Do not allow editing of start/size/fs-type for partitions that 

are already carved in stone (e.g. defined in an outer MBR while we are
editing the inner disklabel).
This commit is contained in:
martin 2021-05-09 11:06:20 +00:00
parent e2b83173c8
commit df9fc8fe01
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
usr.sbin/sysinst/label.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: label.c,v 1.32 2021/01/31 22:45:46 rillig Exp $ */
/* $NetBSD: label.c,v 1.33 2021/05/09 11:06:20 martin 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.32 2021/01/31 22:45:46 rillig Exp $");
__RCSID("$NetBSD: label.c,v 1.33 2021/05/09 11:06:20 martin Exp $");
#endif
#include <sys/types.h>
@ -1070,9 +1070,23 @@ update_edit_ptn_menu(menudesc *m, void *arg)
edit->pset->parts, edit->id, attr_no))
continue;
}
/*
* Do not allow editing of size/start/type when partition
* is defined in some outer partition table already
*/
if ((edit->pset->infos[edit->index].flags & PUIFLG_IS_OUTER)
&& (m->opts[i].opt_action == edit_fs_type
|| m->opts[i].opt_action == edit_fs_start
|| m->opts[i].opt_action == edit_fs_size))
continue;
/* Ok: we want this one */
m->opts[i].opt_flags &= ~OPT_IGNORE;
}
/* Avoid starting at a (now) disabled menu item */
while (m->cursel >= 0 && m->cursel < m->numopts
&& (m->opts[m->cursel].opt_flags & OPT_IGNORE))
m->cursel++;
}
static void
@ -1123,7 +1137,10 @@ draw_edit_ptn_line(menudesc *m, int opt, void *arg)
if (m->opts[opt].opt_flags & OPT_IGNORE
&& (opt != 3 || edit->info.fs_type == FS_UNUSED)
&& m->opts[opt].opt_action != edit_ptn_custom_type) {
&& m->opts[opt].opt_action != edit_ptn_custom_type
&& m->opts[opt].opt_action != edit_fs_type
&& m->opts[opt].opt_action != edit_fs_start
&& m->opts[opt].opt_action != edit_fs_size) {
wprintw(m->mw, "%*s -", col_width, "");
return;
}