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

2002-03-24 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
* stage2/stage2.c (run_menu): Call cls outside the loop to run
	scripts.
	* stage2/cmdline.c (run_script): Prompt a user's intervention,
	only when FALLBACK_ENTRY is negative.
This commit is contained in:
okuji 2002-03-24 12:28:54 +00:00
parent dfccfe6d92
commit 3c5148ff24
7 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2002-03-24 Yoshinori K. Okuji <okuji@enbug.org>
* stage2/stage2.c (run_menu): Call cls outside the loop to run
scripts.
* stage2/cmdline.c (run_script): Prompt a user's intervention,
only when FALLBACK_ENTRY is negative.
2002-02-11 Pavel Roskin <proski@gnu.org> 2002-02-11 Pavel Roskin <proski@gnu.org>
* util/grub-install.in (find_device): New function - find block * util/grub-install.in (find_device): New function - find block

2
docs/grub-install.8
View file

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23.
.TH GRUB-INSTALL "8" "February 2002" "grub-install (GNU GRUB 0.91)" FSF .TH GRUB-INSTALL "8" "March 2002" "grub-install (GNU GRUB 0.91)" FSF
.SH NAME .SH NAME
grub-install \- install GRUB on your drive grub-install \- install GRUB on your drive
.SH SYNOPSIS .SH SYNOPSIS

2
docs/grub-md5-crypt.8
View file

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23.
.TH GRUB-MD5-CRYPT "8" "February 2002" "grub-md5-crypt (GNU GRUB )" FSF .TH GRUB-MD5-CRYPT "8" "March 2002" "grub-md5-crypt (GNU GRUB )" FSF
.SH NAME .SH NAME
grub-md5-crypt \- Encrypt a password in MD5 format grub-md5-crypt \- Encrypt a password in MD5 format
.SH SYNOPSIS .SH SYNOPSIS

2
docs/grub.8
View file

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23.
.TH GRUB "8" "February 2002" "grub (GNU GRUB 0.91)" FSF .TH GRUB "8" "March 2002" "grub (GNU GRUB 0.91)" FSF
.SH NAME .SH NAME
grub \- the grub shell grub \- the grub shell
.SH SYNOPSIS .SH SYNOPSIS

2
docs/mbchk.1
View file

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23.
.TH MBCHK "1" "February 2002" "mbchk (GNU GRUB 0.91)" FSF .TH MBCHK "1" "March 2002" "mbchk (GNU GRUB 0.91)" FSF
.SH NAME .SH NAME
mbchk \- check the format of a Multiboot kernel mbchk \- check the format of a Multiboot kernel
.SH SYNOPSIS .SH SYNOPSIS

11
stage2/cmdline.c
View file

@ -197,8 +197,15 @@ run_script (char *script, char *heap)
if (errnum) if (errnum)
{ {
errnum = ERR_NONE; errnum = ERR_NONE;
grub_printf ("\nPress any key to continue...");
(void) getkey (); /* If a fallback entry is defined, don't prompt a user's
intervention. */
if (fallback_entry < 0)
{
grub_printf ("\nPress any key to continue...");
(void) getkey ();
}
return 1; return 1;
} }

4
stage2/stage2.c
View file

@ -808,10 +808,10 @@ restart:
/* Enable the auto fill mode. */ /* Enable the auto fill mode. */
auto_fill = 1; auto_fill = 1;
cls ();
while (1) while (1)
{ {
cls ();
if (config_entries) if (config_entries)
printf (" Booting \'%s\'\n\n", printf (" Booting \'%s\'\n\n",
get_entry (menu_entries, first_entry + entryno, 0)); get_entry (menu_entries, first_entry + entryno, 0));