diff options
author | dcs <dcs@FreeBSD.org> | 2000-09-15 07:54:10 +0000 |
---|---|---|
committer | dcs <dcs@FreeBSD.org> | 2000-09-15 07:54:10 +0000 |
commit | 12daa03d595b05ad279374bf328d1c3240c1154b (patch) | |
tree | 342e4995b627f9959fd9e040de333aec8045e0c0 /sys | |
parent | fba792ce506757684c71be33dad6b04a735b12c3 (diff) | |
download | FreeBSD-src-12daa03d595b05ad279374bf328d1c3240c1154b.zip FreeBSD-src-12daa03d595b05ad279374bf328d1c3240c1154b.tar.gz |
Start countdown only _after_ the kernel was loaded. Not very fair otherwise.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/boot/common/boot.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/boot/common/boot.c b/sys/boot/common/boot.c index 70b1fb1..1c65279 100644 --- a/sys/boot/common/boot.c +++ b/sys/boot/common/boot.c @@ -175,10 +175,6 @@ autoboot(int timeout, char *prompt) if (timeout == -1) /* all else fails */ timeout = 10; - otime = time(NULL); - when = otime + timeout; /* when to boot */ - yes = 0; - kernelname = getenv("kernelname"); if (kernelname == NULL) { argv[0] = NULL; @@ -190,6 +186,10 @@ autoboot(int timeout, char *prompt) } } + otime = time(NULL); + when = otime + timeout; /* when to boot */ + yes = 0; + printf("%s\n", (prompt == NULL) ? "Hit [Enter] to boot immediately, or any other key for command prompt." : prompt); for (;;) { |