diff options
| author |   deraadt <deraadt@openbsd.org> | 2008-03-23 17:05:40 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2008-03-23 17:05:40 +0000 |
| commit | d16b53ccd0e97e44dfdd14fcf87f2b01648d464e (patch) | |
| tree | c77a65451a562e713334984ba4bfcb9b378cfabf /sys/kern/subr_disk.c | |
| parent | Bring mac68k into the md_checkfordisklabel()-free world. (diff) | |
| download | wireguard-openbsd-d16b53ccd0e97e44dfdd14fcf87f2b01648d464e.tar.xz wireguard-openbsd-d16b53ccd0e97e44dfdd14fcf87f2b01648d464e.zip | |
setroot() is supposed to be safe in all cases, so kill the special cases
for RB_DFLTROOT; ok miod
Diffstat (limited to 'sys/kern/subr_disk.c')
| -rw-r--r-- | sys/kern/subr_disk.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index a07904647e4..9a8f851a817 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.68 2007/12/23 01:59:58 dlg Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.69 2008/03/23 17:05:40 deraadt Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -1064,9 +1064,6 @@ setroot(struct device *bootdv, int part, int exitflags) extern char *nfsbootdevname; #endif - if (boothowto & RB_DFLTROOT) - return; - #ifdef RAMDISK_HOOKS bootdv = &fakerdrootdev; mountroot = NULL; |