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

Fix test for active root partition when booting from a wedge

This commit is contained in:
martin 2018-11-09 15:20:36 +00:00
parent fd70b7a6af
commit 5864e121ba
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/sysinst/disks.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disks.c,v 1.22 2018/11/08 20:29:37 martin Exp $ */
/* $NetBSD: disks.c,v 1.23 2018/11/09 15:20:36 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -619,7 +619,8 @@ get_disks_helper(void *arg, const char *dev)
* Exclude a disk mounted as root partition,
* in case of install-image on a USB memstick.
*/
if (is_active_rootpart(state->dd->dd_name, 0))
if (is_active_rootpart(state->dd->dd_name,
state->dd->dd_no_part ? -1 : 0))
return true;
if (!state->dd->dd_no_part) {

8
usr.sbin/sysinst/target.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: target.c,v 1.3 2015/10/18 09:21:55 martin Exp $ */
/* $NetBSD: target.c,v 1.4 2018/11/09 15:20:36 martin Exp $ */
/*
* Copyright 1997 Jonathan Stone
@ -71,7 +71,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: target.c,v 1.3 2015/10/18 09:21:55 martin Exp $");
__RCSID("$NetBSD: target.c,v 1.4 2018/11/09 15:20:36 martin Exp $");
#endif
/*
@ -186,8 +186,12 @@ is_active_rootpart(const char *dev, int ptn)
if (strcmp(dev, rootdev) != 0)
return 0;
if (ptn < 0)
return 1; /* device only check, or wedge */
mib[1] = KERN_ROOT_PARTITION;
varlen = sizeof rootptn;
rootptn = -1;
if (sysctl(mib, 2, &rootptn, &varlen, NULL, 0) < 0)
return 1;