From 5a20bc0d54ca3589793db0380eb63b637aab1efa Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Thu, 26 Oct 2006 19:41:02 +0000 Subject: [PATCH] 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 --- sys/boot/i386/boot2/boot2.c | 6 ++++-- 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 9e239be9697..df3fe81d17c 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 9e239be9697..df3fe81d17c 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,