Fix #136: drop old init client tool

The SysV API compatibility layer gives too little value to be worth
the effort of maintaining it. Users are encouraged to use the
`initctl` tool instead.

Signed-off-by: Jacques de Laval <jacques@de-laval.se>

src/Makefile.am

@@ -22,7 +22,6 @@ endif
 
 finit_SOURCES      = api.c	cgroup.c	cgroup.h	\
 		     cond.c	cond-w.c	cond.h		\
-		     telinit.c					\
 		     conf.c	conf.h				\
 		     exec.c	finit.c		finit.h		\
 		     getty.c	stty.c				\
@@ -61,7 +60,7 @@ reboot_SOURCES     = reboot.c util.c util.h
 reboot_CFLAGS      = $(lite_CFLAGS)
 reboot_LDADD       = $(lite_LIBS)
 
-INIT_LNKS          = telinit init
+INIT_LNKS          = init
 REBOOT_LNKS        = shutdown halt poweroff suspend
 
 if WATCHDOGD

src/api.c

@@ -183,12 +183,6 @@ static void send_svc(int sd, svc_t *svc)
 		_d("Failed sending svc_t to client");
 }
 
-
-/*
- * In contrast to the SysV compat handling in plugins/initctl.c, when
- * `initctl runlevel 0` is issued we default to POWERDOWN the system
- * instead of just halting.
- */
 static void api_cb(uev_t *w, void *arg, int events)
 {
 	int sd, lvl;

src/finit.c

@@ -368,12 +368,12 @@ int main(int argc, char *argv[])
 	};
 	uev_ctx_t loop;
 
-	/*
-	 * finit/init/telinit client tool uses /dev/initctl pipe
-	 * for compatibility but initctl client tool uses socket
-	 */
-	if (getpid() != 1)
-		return client(argc, argv);
+	if (getpid() != 1) {
+		fprintf(stderr, "Running Finit as anything other than PID 1 "
+			"is not supported.\n"
+			"The initctl tool is the new command line API.\n");
+		return 1;
+	}
 
 	/*
 	 * Need /dev, /proc, and /sys for console=, remount and cgroups

src/finit.h

@@ -49,11 +49,7 @@
 #define LINE_SIZE               1024
 #define BUF_SIZE                4096
 
-/*
- * We extend the INIT_CMD_ range for the new initctl tool, Finit only
- * support changing runlevel, reloading the configuration and setenv
- * with the old-style /dev/initctl FIFO.
- */
+/* We extend the INIT_CMD_ range for the new initctl tool. */
 #define INIT_SOCKET             _PATH_VARRUN "finit/socket"
 #define INIT_MAGIC              0x03091969
 

src/initctl.c

@@ -1,4 +1,4 @@
-/* New client tool, complements old /dev/initctl API and telinit tool
+/* New client tool, replaces old /dev/initctl API and telinit tool
  *
  * Copyright (c) 2015-2021  Joachim Wiberg <troglobit@gmail.com>
  *

src/private.h

@@ -31,8 +31,6 @@
 int       api_init         (uev_ctx_t *ctx);
 int       api_exit         (void);
 
-int       client           (int argc, char *argv[]);
-
 void      service_monitor  (pid_t lost, int status);
 
 const char *plugin_hook_str(hook_point_t no);

src/sig.c

@@ -26,7 +26,7 @@
  * the following signals have been adopted:
  *
  * SIGHUP
- *      Same effect as init/telinit q, reloads *.conf in /etc/finit.d/
+ *      Same effect as initctl reload, reloads *.conf in /etc/finit.d/
  *      Also restarts API (initctl) socket, like SysV init and systemd
  *      does on USR1 with their FIFO/D-Bus.
  *
@@ -88,7 +88,7 @@ extern svc_t *wdog;
 /*
  * Old-style SysV shutdown sends a setenv cmd INIT_HALT with "=HALT",
  * "=POWERDOWN", or "" to cancel shutdown, before requesting change to
- * runlevel 6 over the /dev/initctl FIFO.  See plugins/initctl.c
+ * runlevel 6 over the /dev/initctl FIFO.
  */
 shutop_t halt = SHUT_DEFAULT;
 

src/telinit.c

@@ -1,159 +0,0 @@
-/* Simple telinit client
- *
- * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "config.h"		/* Generated by configure script */
-
-#include <ctype.h>
-#include <getopt.h>
-#include <stdio.h>
-#include <lite/lite.h>
-
-#include "finit.h"
-#include "util.h"
-
-static int do_send(struct init_request *rq)
-{
-	static int fd = -1;
-	int result = 255;
-	ssize_t len;
-
-	if (fd == -1) {
-		if (!fexist(FINIT_FIFO)) {
-			fprintf(stderr, "%s does not support %s!\n", prognm, FINIT_FIFO);
-			return 1;
-		}
-
-		fd = open(FINIT_FIFO, O_RDWR);
-		if (-1 == fd) {
-			perror("Failed opening " FINIT_FIFO);
-			return 1;
-		}
-	}
-
-	len = write(fd, rq, sizeof(*rq));
-	if (sizeof(*rq) == len)
-		result = 0;
-
-	return result;
-}
-
-static int do_reload(void)
-{
-	struct init_request rq = {
-		.magic    = INIT_MAGIC,
-		.cmd      = INIT_CMD_RELOAD,
-	};
-
-	return do_send(&rq);
-}
-
-static int set_env(int runlevel)
-{
-	struct init_request rq = {
-		.magic    = INIT_MAGIC,
-		.cmd      = INIT_CMD_SETENV,
-	};
-
-	if (runlevel == 0) {
-		strlcpy(rq.data, "INIT_HALT=POWERDOWN", sizeof(rq.data));
-		return do_send(&rq);
-	}
-
-	return 0;
-}
-
-static int set_runlevel(int runlevel)
-{
-	struct init_request rq = {
-		.magic    = INIT_MAGIC,
-		.cmd      = INIT_CMD_RUNLVL,
-		.runlevel = runlevel,
-	};
-
-	return set_env(runlevel) || do_send(&rq);
-}
-
-/* telinit q | telinit <0-9> */
-static int usage(int rc)
-{
-	fprintf(stderr, "Usage: %s [OPTIONS] [q | Q | 0-9]\n\n"
-		"Options:\n"
-		"  -h, --help      This help text\n"
-		"  -V, --version   Show Finit version\n\n"
-		"Commands:\n"
-		"  0               Power-off the system, same as initctl poweroff\n"
-		"  6               Reboot the system, same as initctl reboot\n"
-		"  2, 3, 4, 5      Change runlevel. Starts services in new runlevel, stops any\n"
-		"                  services in prev. runlevel that are not allowed in new.\n"
-		"  q, Q            Reload *.conf in /etc/finit.d/, same as initctl reload or\n"
-		"                  sending SIGHUP to PID 1\n"
-		"  1, s, S         Enter system rescue mode, runlevel 1\n"
-		"\n", prognm);
-
-	return rc;
-}
-
-int client(int argc, char *argv[])
-{
-	int c;
-	struct option long_options[] = {
-		{"help",    0, NULL, 'h'},
-		{"version", 0, NULL, 'v'},
-		{NULL, 0, NULL, 0}
-	};
-
-	progname(argv[0]);
-	while ((c = getopt_long(argc, argv, "h?v", long_options, NULL)) != EOF) {
-		switch(c) {
-		case 'v':
-			return puts("v" VERSION) == EOF;
-
-		case 'h':
-		case '?':
-			return usage(0);
-		}
-	}
-
-	if (optind < argc) {
-		int req = (int)argv[optind][0];
-
-		if (isdigit(req))
-			return set_runlevel(req);
-
-		if (req == 'q' || req == 'Q')
-			return do_reload();
-
-		if (req == 's' || req == 'S')
-			return set_runlevel(1);
-	}
-
-	return usage(1);
-}
-
-/**
- * Local Variables:
- *  indent-tabs-mode: t
- *  c-file-style: "linux"
- * End:
- */