Revert change from Fedora/RedHat where the now obsolete command
authorPetter Reinholdtsen <pere@hungry.com>
Sat, 14 Nov 2009 21:00:43 +0000 (21:00 +0000)
committerPetter Reinholdtsen <pere@hungry.com>
Sat, 14 Nov 2009 21:00:43 +0000 (21:00 +0000)
INIT_CMD_CHANGECONS was introduced.  Based on feedback and patch
from Bill Nottingham.

git-svn-id: svn://svn.sv.gnu.org/sysvinit/sysvinit/trunk@8 456724a4-4300-0410-8514-c89748c515a2

doc/Changelog
src/init.c
src/initreq.h

index 0b4864a6e28843816c55708d13b38d914a57a681..bafbdb9e0baa0dc68c91f29db10b2074df195582 100644 (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
 
   * Fix typos and do minor updates in the manual pages.
index 4569cfee22f2a90bc2827e8519032120edef15c0..9b4708396426d56a0c6b3eb656479dfa078230dc 100644 (file)
@@ -125,7 +125,6 @@ int sltime = 5;                     /* Sleep time between TERM and KILL */
 char *argv0;                   /* First arguments; show up in ps listing */
 int maxproclen;                        /* Maximal length of argv[0] with \0 */
 struct utmp utproto;           /* Only used for sizeof(utproto.ut_id) */
-char *user_console = NULL;     /* User console device */
 char *console_dev;             /* Console device. */
 int pipe_fd = -1;              /* /dev/initctl */
 int did_boot = 0;              /* Did we already do BOOT* stuff? */
@@ -497,9 +496,7 @@ void console_init(void)
        int tried_vtmaster = 0;
        char *s;
 
-       if (user_console) {
-               console_dev = user_console;
-       } else if ((s = getenv("CONSOLE")) != NULL)
+       if ((s = getenv("CONSOLE")) != NULL)
                console_dev = s;
        else {
                console_dev = CONSOLE;
@@ -2142,18 +2139,6 @@ void check_init_fifo(void)
                case INIT_CMD_SETENV:
                        initcmd_setenv(request.i.data, sizeof(request.i.data));
                        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:
                        initlog(L_VB, "got unimplemented initrequest.");
                        break;
index f53359412f97a0eb328b81aed72c88483916e906..757ffe0eadc783125ff966ef128749f4b233810d 100644 (file)
@@ -41,8 +41,6 @@
 #define INIT_CMD_SETENV                6
 #define INIT_CMD_UNSETENV      7
 
-#define INIT_CMD_CHANGECONS    12345
-
 #ifdef MAXHOSTNAMELEN
 #  define INITRQ_HLEN  MAXHOSTNAMELEN
 #else