diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-03-23 17:05:43 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-03-23 17:05:43 +0000 |
| commit | 18aeccd206e6581339dd7d7a6200670cf222cc35 (patch) | |
| tree | 6cf1f0033959ffcb6492a3939dae5a0635d4f0b4 /sys/arch/sgi | |
| parent | 9e95a4dd7a4a29af2d5d1c32a8192d1f8bc8e93e (diff) | |
setroot() is supposed to be safe in all cases, so kill the special cases
for RB_DFLTROOT; ok miod
Diffstat (limited to 'sys/arch/sgi')
| -rw-r--r-- | sys/arch/sgi/sgi/machdep.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/arch/sgi/sgi/machdep.c b/sys/arch/sgi/sgi/machdep.c index d01d2925fbe..a0b15e7c7f6 100644 --- a/sys/arch/sgi/sgi/machdep.c +++ b/sys/arch/sgi/sgi/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.54 2008/02/20 19:13:38 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.55 2008/03/23 17:05:41 deraadt Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -343,14 +343,8 @@ bios_printf("SR=%08x\n", getsr()); /* leave this in for now. need to see sr */ /* * Look at arguments passed to us and compute boothowto. - * Default to AUTOBOOT if no args or SINGLE and DFLTROOT - * if this is a ramdisk kernel. */ -#ifdef RAMDISK_HOOKS - boothowto = RB_SINGLE | RB_DFLTROOT; -#else boothowto = RB_AUTOBOOT; -#endif /* RAMDISK_HOOKS */ dobootopts(argc, argv); |