diff options
| author | ru <ru@FreeBSD.org> | 2006-10-26 19:41:02 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2006-10-26 19:41:02 +0000 |
| commit | 00c76003d21be410074c6b86bd84fea984ff7b3b (patch) | |
| tree | 2742f42c039e4f82a46d78bfebeb75999c0fd97c /sys/boot | |
| parent | 72a6cefb676580a477cf44be390192249677b561 (diff) | |
| download | FreeBSD-src-00c76003d21be410074c6b86bd84fea984ff7b3b.zip FreeBSD-src-00c76003d21be410074c6b86bd84fea984ff7b3b.tar.gz | |
Restore support for -c and -d that were treacherously murdered in
rev. 1.58. (This only costs us four bytes.)
Prodded by: bde
MFC after: 3 days
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/i386/boot2/boot2.c | 6 | ||||
| -rw-r--r-- | sys/boot/i386/gptboot/gptboot.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c index 9e239be..df3fe81 100644 --- a/sys/boot/i386/boot2/boot2.c +++ b/sys/boot/i386/boot2/boot2.c @@ -79,7 +79,7 @@ __FBSDID("$FreeBSD$"); #define PATH_KERNEL "/boot/kernel/kernel" #define ARGS 0x900 -#define NOPT 12 +#define NOPT 14 #define NDEV 3 #define MEM_BASE 0x12 #define MEM_EXT 0x15 @@ -99,12 +99,14 @@ __FBSDID("$FreeBSD$"); extern uint32_t _end; -static const char optstr[NOPT] = "DhaCgmnpqrsv"; /* Also 'P', 'S' */ +static const char optstr[NOPT] = "DhaCcdgmnpqrsv"; /* Also 'P', 'S' */ static const unsigned char flags[NOPT] = { RBX_DUAL, RBX_SERIAL, RBX_ASKNAME, RBX_CDROM, + RBX_CONFIG, + RBX_KDB, RBX_GDB, RBX_MUTE, RBX_NOINTR, diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c index 9e239be..df3fe81 100644 --- a/sys/boot/i386/gptboot/gptboot.c +++ b/sys/boot/i386/gptboot/gptboot.c @@ -79,7 +79,7 @@ __FBSDID("$FreeBSD$"); #define PATH_KERNEL "/boot/kernel/kernel" #define ARGS 0x900 -#define NOPT 12 +#define NOPT 14 #define NDEV 3 #define MEM_BASE 0x12 #define MEM_EXT 0x15 @@ -99,12 +99,14 @@ __FBSDID("$FreeBSD$"); extern uint32_t _end; -static const char optstr[NOPT] = "DhaCgmnpqrsv"; /* Also 'P', 'S' */ +static const char optstr[NOPT] = "DhaCcdgmnpqrsv"; /* Also 'P', 'S' */ static const unsigned char flags[NOPT] = { RBX_DUAL, RBX_SERIAL, RBX_ASKNAME, RBX_CDROM, + RBX_CONFIG, + RBX_KDB, RBX_GDB, RBX_MUTE, RBX_NOINTR, |
