openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-04-24 06:04:47 +00:00
Code Issues Projects Releases Wiki Activity

Skip inserting rrootdisk and rootdisk into the database. There

Browse Source 
are callers to devname(3) who get don't understand that the database
isn't covering a 1:1 relationship...
ok bluhm robert beck
this is a part of 7.8 errata 001
This commit is contained in:
deraadt
2025-10-27 16:17:08 +00:00
parent fa85ee632c
commit 1fc5576e26
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/dev_mkdb/dev_mkdb.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: dev_mkdb.c,v 1.20 2023/12/24 06:35:05 gnezdo Exp $ */
/* $OpenBSD: dev_mkdb.c,v 1.21 2025/10/27 16:17:08 deraadt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -112,11 +112,15 @@ main(int argc, char *argv[])
continue;
/* Create the key. */
if (S_ISCHR(dp->fts_statp->st_mode))
if (S_ISCHR(dp->fts_statp->st_mode)) {
if (strcmp(dp->fts_path, "./rrootdisk") == 0)
continue;
bkey.type = S_IFCHR;
else if (S_ISBLK(dp->fts_statp->st_mode))
} else if (S_ISBLK(dp->fts_statp->st_mode)) {
if (strcmp(dp->fts_path, "./rootdisk") == 0)
continue;
bkey.type = S_IFBLK;
else
} else
continue;
bkey.dev = dp->fts_statp->st_rdev;