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

rc_runlevel is now the preferred kernel commandline option for choosing default runlevel.

Browse Source
This commit is contained in:
Roy Marples 2008-04-08 15:59:56 +00:00
parent 71dd280656
commit e82435c2f4
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/rc/rc.c
View File

@ -691,12 +691,15 @@ static void do_newlevel(const char *newlevel)
run_script(INITSH); run_script(INITSH);
#ifdef __linux__ #ifdef __linux__
/* If we requested a softlevel, save it now */ /* If we requested a runlevel, save it now */
set_krunlevel(NULL); if ((cmd = proc_getent("rc_runlevel"))) {
if ((cmd = proc_getent("softlevel"))) {
set_krunlevel(cmd); set_krunlevel(cmd);
free(cmd); free(cmd);
} } else if ((cmd = proc_getent("softlevel"))) {
set_krunlevel(cmd);
free(cmd);
} else
set_krunlevel(NULL);
#endif #endif
/* Setup our coldplugged services now */ /* Setup our coldplugged services now */
@ -1049,7 +1052,7 @@ int main(int argc, char **argv)
snprintf(pidstr, sizeof(pidstr), "%d", getpid()); snprintf(pidstr, sizeof(pidstr), "%d", getpid());
setenv("RC_PID", pidstr, 1); setenv("RC_PID", pidstr, 1);
/* Load current softlevel */ /* Load current runlevel */
bootlevel = getenv("RC_BOOTLEVEL"); bootlevel = getenv("RC_BOOTLEVEL");
runlevel = rc_runlevel_get(); runlevel = rc_runlevel_get();
@ -1199,7 +1202,7 @@ int main(int argc, char **argv)
} }
} }
/* Save our softlevel now */ /* Save our runlevel now */
if (going_down) if (going_down)
rc_runlevel_set(newlevel); rc_runlevel_set(newlevel);