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

Revert change from Fedora/RedHat where the now obsolete command

Browse Source 
INIT_CMD_CHANGECONS was introduced.  Based on feedback and patch
from Bill Nottingham.
This commit is contained in:
Petter Reinholdtsen 2009-11-14 21:00:43 +00:00
parent 7d5009103e
commit cd2937d3b7
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/Changelog
View File

@ -1,3 +1,11 @@
sysvinit (2.88dsf) UNRELEASED; urgency=low
* Revert change from Fedora/RedHat where the now obsolete command
INIT_CMD_CHANGECONS was introduced. Based on feedback and patch
from Bill Nottingham.
-- Petter Reinholdtsen <pere@hungry.com> Sun, 12 Jul 2009 19:58:10 +0200
sysvinit (2.87dsf) world; urgency=low sysvinit (2.87dsf) world; urgency=low
* Fix typos and do minor updates in the manual pages. * Fix typos and do minor updates in the manual pages.

17
src/init.c
View File

@ -125,7 +125,6 @@ int sltime = 5; /* Sleep time between TERM and KILL */
char *argv0; /* First arguments; show up in ps listing */ char *argv0; /* First arguments; show up in ps listing */
int maxproclen; /* Maximal length of argv[0] with \0 */ int maxproclen; /* Maximal length of argv[0] with \0 */
struct utmp utproto; /* Only used for sizeof(utproto.ut_id) */ struct utmp utproto; /* Only used for sizeof(utproto.ut_id) */
char *user_console = NULL; /* User console device */
char *console_dev; /* Console device. */ char *console_dev; /* Console device. */
int pipe_fd = -1; /* /dev/initctl */ int pipe_fd = -1; /* /dev/initctl */
int did_boot = 0; /* Did we already do BOOT* stuff? */ int did_boot = 0; /* Did we already do BOOT* stuff? */
@ -497,9 +496,7 @@ void console_init(void)
int tried_vtmaster = 0; int tried_vtmaster = 0;
char *s; char *s;
if (user_console) { if ((s = getenv("CONSOLE")) != NULL)
console_dev = user_console;
} else if ((s = getenv("CONSOLE")) != NULL)
console_dev = s; console_dev = s;
else { else {
console_dev = CONSOLE; console_dev = CONSOLE;
@ -2142,18 +2139,6 @@ void check_init_fifo(void)
case INIT_CMD_SETENV: case INIT_CMD_SETENV:
initcmd_setenv(request.i.data, sizeof(request.i.data)); initcmd_setenv(request.i.data, sizeof(request.i.data));
break; break;
case INIT_CMD_CHANGECONS:
if (user_console) {
free(user_console);
user_console = NULL;
}
if (!request.i.bsd.reserved[0])
user_console = NULL;
else
user_console = strdup(request.i.bsd.reserved);
console_init();
quit = 1;
break;
default: default:
initlog(L_VB, "got unimplemented initrequest."); initlog(L_VB, "got unimplemented initrequest.");
break; break;

2
src/initreq.h
View File

@ -41,8 +41,6 @@
#define INIT_CMD_SETENV 6 #define INIT_CMD_SETENV 6
#define INIT_CMD_UNSETENV 7 #define INIT_CMD_UNSETENV 7
#define INIT_CMD_CHANGECONS 12345
#ifdef MAXHOSTNAMELEN #ifdef MAXHOSTNAMELEN
# define INITRQ_HLEN MAXHOSTNAMELEN # define INITRQ_HLEN MAXHOSTNAMELEN
#else #else