diff options
Diffstat (limited to 'sys/stand')
| -rw-r--r-- | sys/stand/boot/boot.c | 4 | ||||
| -rw-r--r-- | sys/stand/boot/cmd.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/stand/boot/boot.c b/sys/stand/boot/boot.c index 402537771de..d36189d983b 100644 --- a/sys/stand/boot/boot.c +++ b/sys/stand/boot/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.33 2007/05/29 00:03:13 deraadt Exp $ */ +/* $OpenBSD: boot.c,v 1.34 2007/06/13 02:17:32 drahn Exp $ */ /* * Copyright (c) 2003 Dale Rahn @@ -49,11 +49,11 @@ struct cmd_state cmd; /* bootprompt can be set by MD code to avoid prompt first time round */ int bootprompt = 1; +const char *bootfile = KERNEL; void boot(dev_t bootdev) { - const char *bootfile = KERNEL; int try = 0, st; u_long marks[MARK_MAX]; diff --git a/sys/stand/boot/cmd.h b/sys/stand/boot/cmd.h index d123530964c..610607f03ee 100644 --- a/sys/stand/boot/cmd.h +++ b/sys/stand/boot/cmd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.h,v 1.15 2004/06/24 22:10:18 tom Exp $ */ +/* $OpenBSD: cmd.h,v 1.16 2007/06/13 02:17:32 drahn Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -28,6 +28,7 @@ */ #define CMD_BUFF_SIZE 133 +#define BOOTDEVLEN 1024 struct cmd_table { char *cmd_name; @@ -40,7 +41,7 @@ struct cmd_table { }; struct cmd_state { - char bootdev[16]; /* device */ + char bootdev[BOOTDEVLEN]; /* device */ char image[MAXPATHLEN - 16]; /* image */ int boothowto; /* howto */ char *conf; /* /etc/boot.conf normally */ |