diff options
Diffstat (limited to 'sys/boot/common/boot.c')
| -rw-r--r-- | sys/boot/common/boot.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/boot/common/boot.c b/sys/boot/common/boot.c index 2de8603e881e..608c9d02a921 100644 --- a/sys/boot/common/boot.c +++ b/sys/boot/common/boot.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: boot.c,v 1.9 1998/10/31 17:12:32 dfr Exp $ + * $Id: boot.c,v 1.6 1998/10/11 10:10:41 peter Exp $ */ /* @@ -38,7 +38,7 @@ static char *getbootfile(int try); /* List of kernel names to try (may be overwritten by boot.config) XXX should move from here? */ -static char *default_bootfiles = "kernel;kernel.old"; +static char *default_bootfiles = "kernel,kernel.old"; static int autoboot_tried; @@ -203,13 +203,11 @@ autoboot(int delay, char *prompt) break; } if (ntime != otime) { - printf("\rBooting [%s] in %d seconds... ", getbootfile(0), (int)(when - ntime)); + printf("\rBooting [%s] in %d seconds...", getbootfile(0), (int)(when - ntime)); otime = ntime; cr = 1; } } - if (yes) - printf("\rBooting [%s]... ", getbootfile(0)); if (cr) putchar('\n'); if (yes) { @@ -243,11 +241,11 @@ getbootfile(int try) spec = default_bootfiles; while ((try > 0) && (spec != NULL)) { - spec = strchr(spec, ';'); + spec = strchr(spec, ','); try--; } if (spec != NULL) { - if ((ep = strchr(spec, ';')) != NULL) { + if ((ep = strchr(spec, ',')) != NULL) { len = ep - spec; } else { len = strlen(spec); |