summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/stand/boot/boot.c6
-rw-r--r--sys/stand/boot/boot.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/i386/stand/boot/boot.c b/sys/arch/i386/stand/boot/boot.c
index 52c9231c106..f6a217cf01e 100644
--- a/sys/arch/i386/stand/boot/boot.c
+++ b/sys/arch/i386/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.10 1997/07/18 00:52:08 mickey Exp $ */
+/* $OpenBSD: boot.c,v 1.11 1997/07/21 15:36:17 mickey Exp $ */
/*
* Copyright (c) 1997 Michael Shalayeff
@@ -65,8 +65,8 @@ boot(bootdev)
cmd.cwd[0] = '/'; cmd.cwd[1] = '\0';
cmd.addr = (void *)0x100000;
cmd.timeout = 5;
-
devboot(bootdev, cmd.bootdev);
+
f = read_conf(&cmd);
while (1) {
if (f <= 0) /* no boot.conf, or no boot cmd in there */
@@ -93,7 +93,7 @@ boot(bootdev)
int
main()
{
- boot();
+ boot(0);
return 0;
}
#endif
diff --git a/sys/stand/boot/boot.c b/sys/stand/boot/boot.c
index 52c9231c106..f6a217cf01e 100644
--- a/sys/stand/boot/boot.c
+++ b/sys/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.10 1997/07/18 00:52:08 mickey Exp $ */
+/* $OpenBSD: boot.c,v 1.11 1997/07/21 15:36:17 mickey Exp $ */
/*
* Copyright (c) 1997 Michael Shalayeff
@@ -65,8 +65,8 @@ boot(bootdev)
cmd.cwd[0] = '/'; cmd.cwd[1] = '\0';
cmd.addr = (void *)0x100000;
cmd.timeout = 5;
-
devboot(bootdev, cmd.bootdev);
+
f = read_conf(&cmd);
while (1) {
if (f <= 0) /* no boot.conf, or no boot cmd in there */
@@ -93,7 +93,7 @@ boot(bootdev)
int
main()
{
- boot();
+ boot(0);
return 0;
}
#endif