diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2010-09-14 16:57:18 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2010-09-14 16:57:18 +0000 |
| commit | 0a8802d424478b0d21eef2e569bd7fc262e90b18 (patch) | |
| tree | 4e27985cb9f14df4ea779c991af06c7939babbfe /sys/arch | |
| parent | 17567acfb0138884a02c8abe67980a2894c238a8 (diff) | |
Undo unrelated changes commitedby mistake.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/sgi/stand/boot/boot.c | 10 | ||||
| -rw-r--r-- | sys/arch/sgi/stand/libsa32/heap.h | 0 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/sgi/stand/boot/boot.c b/sys/arch/sgi/stand/boot/boot.c index b1543181ed3..6d488d1bd2b 100644 --- a/sys/arch/sgi/stand/boot/boot.c +++ b/sys/arch/sgi/stand/boot/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.16 2010/09/14 16:55:10 miod Exp $ */ +/* $OpenBSD: boot.c,v 1.17 2010/09/14 16:57:15 miod Exp $ */ /* * Copyright (c) 2004 Opsycon AB, www.opsycon.se. @@ -148,11 +148,9 @@ dobootopts(int argc, char **argv) SystemPartition = &cp[16]; } - /* If "OSLoadFilename=" is missing, see if any arg was given. */ - if (bootauto == AUTO_NONE) { - if (*argv[1] == '/') - OSLoadFilename = argv[1]; - } + /* If "OSLoadOptions=" is missing, see if any arg was given. */ + if (bootauto == AUTO_NONE && *argv[1] == '/') + OSLoadFilename = argv[1]; if (bootauto == AUTO_MINI) { static char loadpart[64]; diff --git a/sys/arch/sgi/stand/libsa32/heap.h b/sys/arch/sgi/stand/libsa32/heap.h deleted file mode 100644 index e69de29bb2d..00000000000 --- a/sys/arch/sgi/stand/libsa32/heap.h +++ /dev/null |