emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RC_INTERACTIVE now works, #178331.

Browse Source
This commit is contained in:
Roy Marples 2007-05-14 12:48:37 +00:00
parent bbfb7bc409
commit 14c59d4071
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -3,9 +3,10 @@
14 May 2007; Roy Marples <uberlord@gentoo.org>: 14 May 2007; Roy Marples <uberlord@gentoo.org>:
RC_INTERACTIVE now works, #178331.
Add --startas back to s-s-d, #175980, #175981. Add --startas back to s-s-d, #175980, #175981.
Allow time for pidfiles to be created, #178274. Allow time for pidfiles to be created, #178274.
Use int instead of char for getopt, #178084 thanks to drizztbsd. Use int instead of char for getopt, #178084 thanks to drizztbsd.
11 May 2007; Roy Marples <uberlord@gentoo.org>: 11 May 2007; Roy Marples <uberlord@gentoo.org>:

12
src/rc.c
View File

@ -367,7 +367,12 @@ static char read_key (bool block)
static bool want_interactive (void) static bool want_interactive (void)
{ {
char c = read_key (false); char c;
if (! rc_is_env ("RC_INTERACTIVE", "yes"))
return (false);
c = read_key (false);
return ((c == 'I' || c == 'i') ? true : false); return ((c == 'I' || c == 'i') ? true : false);
} }
@ -741,8 +746,9 @@ int main (int argc, char **argv)
ecolor (ecolor_good), uts.sysname, ecolor (ecolor_bracket), ecolor (ecolor_good), uts.sysname, ecolor (ecolor_bracket),
ecolor (ecolor_normal)); ecolor (ecolor_normal));
printf ("Press %sI%s to enter interactive boot mode\n\n", if (rc_is_env ("RC_INTERACTIVE", "yes"))
ecolor (ecolor_good), ecolor (ecolor_normal)); printf ("Press %sI%s to enter interactive boot mode\n\n",
ecolor (ecolor_good), ecolor (ecolor_normal));
setenv ("RC_SOFTLEVEL", newlevel, 1); setenv ("RC_SOFTLEVEL", newlevel, 1);
rc_plugin_run (rc_hook_runlevel_start_in, newlevel); rc_plugin_run (rc_hook_runlevel_start_in, newlevel);