diff options
| author |   florian <florian@openbsd.org> | 2019-04-10 19:41:03 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2019-04-10 19:41:03 +0000 |
| commit | 3642b21172b7bfac6d68b8419bc035f19e5925a9 (patch) | |
| tree | fd3873ecf5724823c9dd233eb4be940922d84d31 | |
| parent | use AOC and DAC instead of standard's names "optical / copper pigtail" (diff) | |
| download | wireguard-openbsd-3642b21172b7bfac6d68b8419bc035f19e5925a9.tar.xz wireguard-openbsd-3642b21172b7bfac6d68b8419bc035f19e5925a9.zip | |
Unbreak "boot bsd.up" line in /etc/boot.conf
Found the hard way by Raf Czlonka (rczlonka AT gmail), thanks!
OK deraadt
| -rw-r--r-- | sys/stand/boot/boot.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/stand/boot/boot.c b/sys/stand/boot/boot.c index ea452c54ece..31a2ddf8a0a 100644 --- a/sys/stand/boot/boot.c +++ b/sys/stand/boot/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.47 2019/04/10 04:17:37 deraadt Exp $ */ +/* $OpenBSD: boot.c,v 1.48 2019/04/10 19:41:03 florian Exp $ */ /* * Copyright (c) 2003 Dale Rahn @@ -76,13 +76,13 @@ boot(dev_t bootdev) cmd.addr = (void *)DEFAULT_KERNEL_ADDRESS; cmd.timeout = boottimeout; - st = read_conf(); - if (upgrade()) { strlcpy(cmd.image, "/bsd.upgrade", sizeof(cmd.image)); printf("upgrade detected: switching to %s\n", cmd.image); } + st = read_conf(); + #ifdef HIBERNATE int bootdev_has_hibernate(void); |