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

Added check for kernel parameter init.autocon=1. If this exists, then

Browse Source 
init will try to open its own console. If not, then any console=
parameters will be ignored. This avoids conflicts with native kernel
created consoles.
This commit is contained in:
Jesse Smith 2018-09-29 17:12:12 -03:00
parent c29655a5c8
commit 7b1d470949
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/Changelog
View File

@ -22,6 +22,10 @@ sysvinit (2.91) UNRELEASED; urgency=low
Updated manual page with new -q (quiet) mode. Updated manual page with new -q (quiet) mode.
Added -h flag for pidof, which was recognized before, but not used. Added -h flag for pidof, which was recognized before, but not used.
The -h flag now displays brief usage information for pidof. The -h flag now displays brief usage information for pidof.
* Added check for kernel parameter init.autocon=1. If this exists, then
init will try to open its own console. If not, then any console=
parameters will be ignored. This avoids conflicts with native kernel
created consoles.
sysvinit (2.90) world; urgency=low sysvinit (2.90) world; urgency=low

5
src/init.c
View File

@ -1345,6 +1345,8 @@ void check_kernel_console()
} }
if (fgets(buf, sizeof(buf), fp)) { if (fgets(buf, sizeof(buf), fp)) {
char* p = buf; char* p = buf;
if ( strstr(p, "init.autocon=1") )
{
while ((p = strstr(p, "console="))) { while ((p = strstr(p, "console="))) {
char* e; char* e;
p += strlen("console="); p += strlen("console=");
@ -1398,7 +1400,8 @@ void check_kernel_console()
initlog(L_VB, "added agetty on %s with id %s", dev, id); initlog(L_VB, "added agetty on %s with id %s", dev, id);
} }
} }
} }
}
} }
fclose(fp); fclose(fp);
return; return;