Deleted Added
full compact
gptboot.c (104620) gptboot.c (104635)
1/*
2 * Copyright (c) 1998 Robert Nordier
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms are freely
6 * permitted provided that the above copyright notice and this
7 * paragraph and the following disclaimer are duplicated in all
8 * such forms.
9 *
10 * This software is provided "AS IS" and without any express or
11 * implied warranties, including, without limitation, the implied
12 * warranties of merchantability and fitness for a particular
13 * purpose.
14 */
15
16/*
1/*
2 * Copyright (c) 1998 Robert Nordier
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms are freely
6 * permitted provided that the above copyright notice and this
7 * paragraph and the following disclaimer are duplicated in all
8 * such forms.
9 *
10 * This software is provided "AS IS" and without any express or
11 * implied warranties, including, without limitation, the implied
12 * warranties of merchantability and fitness for a particular
13 * purpose.
14 */
15
16/*
17 * $FreeBSD: head/sys/boot/i386/gptboot/gptboot.c 104620 2002-10-07 13:11:28Z phk $
17 * $FreeBSD: head/sys/boot/i386/gptboot/gptboot.c 104635 2002-10-07 21:36:06Z phk $
18 */
19
20#include <sys/param.h>
21#include <sys/reboot.h>
22#include <sys/diskslice.h>
23#include <sys/disklabel.h>
24#include <sys/diskmbr.h>
25#include <sys/dirent.h>

--- 238 unchanged lines hidden (view full) ---

264 load(kname);
265 memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL));
266 }
267 }
268
269 /* Present the user with the boot2 prompt. */
270
271 for (;;) {
18 */
19
20#include <sys/param.h>
21#include <sys/reboot.h>
22#include <sys/diskslice.h>
23#include <sys/disklabel.h>
24#include <sys/diskmbr.h>
25#include <sys/dirent.h>

--- 238 unchanged lines hidden (view full) ---

264 load(kname);
265 memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL));
266 }
267 }
268
269 /* Present the user with the boot2 prompt. */
270
271 for (;;) {
272 printf(" \n>> FreeBSD/i386 BOOT\n"
272#ifdef UFS1_ONLY
273 printf(" \n>> FreeBSD/i386/UFS1 BOOT\n"
274#else
275 printf(" \n>> FreeBSD/i386/UFS[12] BOOT\n"
276#endif
273 "Default: %u:%s(%u,%c)%s\n"
274 "boot: ",
275 dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit,
276 'a' + dsk.part, kname);
277 if (ioctrl & IO_SERIAL)
278 sio_flush();
279 if (!autoboot || keyhit(5*SECOND))
280 getstr(cmd, sizeof(cmd));

--- 388 unchanged lines hidden ---
277 "Default: %u:%s(%u,%c)%s\n"
278 "boot: ",
279 dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit,
280 'a' + dsk.part, kname);
281 if (ioctrl & IO_SERIAL)
282 sio_flush();
283 if (!autoboot || keyhit(5*SECOND))
284 getstr(cmd, sizeof(cmd));

--- 388 unchanged lines hidden ---