mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-21 11:13:30 +00:00
Code Issues Releases Activity

MFi386: revisions 232570 and 232754

Browse Source 
Fix boot2 to handle boot config files that only contain a custom path to
  a loader or kernel.
This commit is contained in:
Yoshihiro Takahashi 2012-03-10 15:08:37 +00:00
parent bcfd016cff
commit 08cdfdf1de
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=232784
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/boot/pc98/boot2/boot2.c
View File

@ -130,9 +130,9 @@ static struct dsk {
unsigned part;
unsigned start;
} dsk;
static char cmd[512], cmddup[512];
static char cmd[512], cmddup[512], knamebuf[1024];
static const char *kname = NULL;
static uint32_t opts;
static uint32_t opts = 0;
static int comspeed = SIOSPD;
static struct bootinfo bootinfo;
static uint8_t ioctrl = IO_KEYBOARD;
@ -352,6 +352,7 @@ main(void)
#endif
uint8_t autoboot;
ino_t ino;
size_t nbyte;
dmadat = (void *)(roundup2(__base + (int32_t)&_end, 0x10000) - __base);
v86.ctl = V86_FLAGS;
@ -378,8 +379,10 @@ main(void)
autoboot = 1;
if ((ino = lookup(PATH_CONFIG)) ||
(ino = lookup(PATH_DOTCONFIG)))
fsread(ino, cmd, sizeof(cmd));
(ino = lookup(PATH_DOTCONFIG))) {
nbyte = fsread(ino, cmd, sizeof(cmd) - 1);
cmd[nbyte] = '\0';
}
if (*cmd) {
memcpy(cmddup, cmd, sizeof(cmd));
@ -396,9 +399,9 @@ main(void)
* or in case of failure, try to load a kernel directly instead.
*/
if (autoboot && !kname) {
if (!kname) {
kname = PATH_BOOT3;
if (!keyhit(3*SECOND)) {
if (autoboot && !keyhit(3*SECOND)) {
load();
kname = PATH_KERNEL;
}
@ -595,7 +598,12 @@ parse()
dsk.daua = dsk.disk | dsk.unit;
dsk_meta = 0;
}
kname = arg;
if ((i = ep - arg)) {
if ((size_t)i >= sizeof(knamebuf))
return -1;
memcpy(knamebuf, arg, i + 1);
kname = knamebuf;
}
}
arg = p;
}