d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix interactive booting:

Browse Source 
o Revision 1.38 introduced the -n flag.  It conflicted with the
  RB_BOOTINFO flag, so was in effect always on.  Change the -n flag to
  be bit 0x1c instead of 0x1f.  This also had the consequence that a mal-formed
  /boot.config would render the system unbootable because the user was
  unable to enter anything at all on the command line.
o Remove the initialization of opt to be RB_BOOTINFO since we filter that bit
  out and do not otherwise use it.

Reviewed by: jhb
MFC after: 3 days
This commit is contained in:
Warner Losh 2003-01-13 21:28:24 +00:00
parent 26d48b4044
commit 8e6206d943
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=109197
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/boot/i386/boot2/boot2.c
View File

@ -51,10 +51,12 @@
#define RBX_GDB 0xf /* -g */
#define RBX_MUTE 0x10 /* -m */
#define RBX_PAUSE 0x12 /* -p */
#define RBX_NOINTR 0x1c /* -n */
#define RBX_DUAL 0x1d /* -D */
#define RBX_PROBEKBD 0x1e /* -P */
#define RBX_NOINTR 0x1f /* -n */
/* 0x1f is reserved for the historical RB_BOOTINFO option */
/* pass: -a, -s, -r, -d, -c, -v, -h, -C, -g, -m, -p, -D */
#define RBX_MASK 0x2005ffff
#define PATH_CONFIG "/boot.config"
@ -109,7 +111,7 @@ static struct dsk {
} dsk;
static char cmd[512];
static char kname[1024];
static uint32_t opts = RB_BOOTINFO;
static uint32_t opts = 0;
static struct bootinfo bootinfo;
static uint8_t ioctrl = IO_KEYBOARD;

6
sys/boot/i386/gptboot/gptboot.c
View File

@ -51,10 +51,12 @@
#define RBX_GDB 0xf /* -g */
#define RBX_MUTE 0x10 /* -m */
#define RBX_PAUSE 0x12 /* -p */
#define RBX_NOINTR 0x1c /* -n */
#define RBX_DUAL 0x1d /* -D */
#define RBX_PROBEKBD 0x1e /* -P */
#define RBX_NOINTR 0x1f /* -n */
/* 0x1f is reserved for the historical RB_BOOTINFO option */
/* pass: -a, -s, -r, -d, -c, -v, -h, -C, -g, -m, -p, -D */
#define RBX_MASK 0x2005ffff
#define PATH_CONFIG "/boot.config"
@ -109,7 +111,7 @@ static struct dsk {
} dsk;
static char cmd[512];
static char kname[1024];
static uint32_t opts = RB_BOOTINFO;
static uint32_t opts = 0;
static struct bootinfo bootinfo;
static uint8_t ioctrl = IO_KEYBOARD;