vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added password and Linux bzImage support.

Browse source
This commit is contained in:
erich 1998-08-20 21:04:36 +00:00
parent 6658d7314d
commit 6f9468d1b7
1 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
shared_src/cmdline.c
View file

@ -56,8 +56,8 @@ cmos_read_byte(int loc)
* These are used for determining if the command-line should ask the user * These are used for determining if the command-line should ask the user
* to correct errors during scripts. * to correct errors during scripts.
*/ */
int fallback = -1; int fallback;
int protected = 0; char *password;
char * char *
skip_to(int after_equal, char *cmdline) skip_to(int after_equal, char *cmdline)
@ -175,7 +175,7 @@ restart:
if (fallback < 0) if (fallback < 0)
goto returnit; goto returnit;
print_error(); print_error();
if (protected || errnum == ERR_BOOT_COMMAND) if (password || errnum == ERR_BOOT_COMMAND)
{ {
printf("Press any key to continue..."); printf("Press any key to continue...");
getc(); getc();
@ -220,6 +220,8 @@ returnit:
bsd_boot(type, bootdev); bsd_boot(type, bootdev);
if (type == 'l') if (type == 'l')
linux_boot(); linux_boot();
if (type == 'L')
big_linux_boot();
if (type == 'c') if (type == 'c')
{ {
@ -320,8 +322,21 @@ returnit:
no_decompression = 0; no_decompression = 0;
#endif /* NO_DECOMPRESSION */ #endif /* NO_DECOMPRESSION */
} }
else if (type == 'L' || type == 'l')
{
load_initrd();
}
else else
errnum = ERR_NEED_KERNEL; errnum = ERR_NEED_MB_KERNEL;
}
else if (strcmp("initrd", cur_heap) < 1)
{
if (type == 'L' || type == 'l')
{
load_initrd();
}
else
errnum = ERR_NEED_LX_KERNEL;
} }
else if (strcmp("install", cur_heap) < 1) else if (strcmp("install", cur_heap) < 1)
{ {
@ -457,6 +472,7 @@ returnit:
#ifdef DEBUG #ifdef DEBUG
else if (strcmp("testload", cur_heap) < 1) else if (strcmp("testload", cur_heap) < 1)
{ {
type = 0;
if (open(cur_cmdline)) if (open(cur_cmdline))
{ {
int i; int i;