Module Name: src
Committed By: jmcneill
Date: Tue Nov 14 14:14:29 UTC 2017
Modified Files:
src/sys/kern: kern_subr.c
Log Message:
Include "flash" in list of block devices that don't use partitions.
To generate a diff of this commit:
cvs rdiff -u -r1.218 -r1.219 src/sys/kern/kern_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_subr.c
diff -u src/sys/kern/kern_subr.c:1.218 src/sys/kern/kern_subr.c:1.219
--- src/sys/kern/kern_subr.c:1.218 Thu Nov 9 01:02:55 2017
+++ src/sys/kern/kern_subr.c Tue Nov 14 14:14:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_subr.c,v 1.218 2017/11/09 01:02:55 christos Exp $ */
+/* $NetBSD: kern_subr.c,v 1.219 2017/11/14 14:14:29 jmcneill Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.218 2017/11/09 01:02:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.219 2017/11/14 14:14:29 jmcneill Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@@ -163,12 +163,13 @@ uint64_t booted_nblks;
char *bootspec;
/*
- * Use partition letters if it's a disk class but not a wedge.
- * XXX Check for wedge is kinda gross.
+ * Use partition letters if it's a disk class but not a wedge or flash.
+ * XXX Check for wedge/flash is kinda gross.
*/
#define DEV_USES_PARTITIONS(dv) \
(device_class((dv)) == DV_DISK && \
- !device_is_a((dv), "dk"))
+ !device_is_a((dv), "dk") && \
+ !device_is_a((dv), "flash"))
void
setroot(device_t bootdv, int bootpartition)
