Fix #147: refactor reboot as multi-call to initctl

This patch drops the stand-alone reboot binary and folds it into the
initctl tool, which now becomes a multi-call binary.

With this change the reboot/shutdown/poweroff/halt/suspend commands also
no longer default to sending signals to PID 1, instead it now uses the
initctl <--> finit UNIX domain socket API.  Signals are only used as a
fallback in case of non-working domain socket.  The -f,--force mode of
operation still works, where `reboot(2)` is called directly.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

src/Makefile.am

@@ -8,7 +8,7 @@ else
 AM_LDFLAGS         = -export-dynamic
 endif
 
-sbin_PROGRAMS      = finit initctl reboot
+sbin_PROGRAMS      = finit initctl
 pkglibexec_SCRIPTS = cgreaper.sh
 if WATCHDOGD
 pkglibexec_PROGRAMS = watchdogd
@@ -49,19 +49,15 @@ else
 finit_LDADD       += -ldl
 endif
 
-initctl_SOURCES    = initctl.c client.c client.h \
-		     serv.c serv.h svc.h   \
+initctl_SOURCES    = initctl.c client.c client.h 	\
+		     reboot.c serv.c serv.h svc.h	\
 		     cond.c cond.h util.c util.h
 initctl_CFLAGS     = -W -Wall -Wextra -Wno-unused-parameter -std=gnu99
 initctl_CFLAGS    += $(lite_CFLAGS)
 initctl_LDADD      = $(lite_LIBS)
 
-reboot_SOURCES     = reboot.c util.c util.h
-reboot_CFLAGS      = $(lite_CFLAGS)
-reboot_LDADD       = $(lite_LIBS)
-
 INIT_LNKS          = init
-REBOOT_LNKS        = shutdown halt poweroff suspend
+REBOOT_LNKS        = reboot shutdown halt poweroff suspend
 
 if WATCHDOGD
 watchdogd_SOURCES  = watchdog.c watchdog.h
@@ -72,46 +68,38 @@ endif
 # Hook in install to add finit and reboot symlink(s)
 install-exec-hook:
 	@$(INSTALL_DATA) $(srcdir)/rescue.conf $(DESTDIR)$(pkglibdir)
-	@for file in $(INIT_LNKS); do				\
-		lnk=$(DESTDIR)$(sbindir)/$$file;		\
-		if [ -e $$lnk ]; then				\
-			echo "Skipping $$lnk exists.";		\
-		else						\
-			$(LN_S) finit $$lnk;			\
-		fi;						\
+	@for file in $(INIT_LNKS); do			\
+		lnk=$(DESTDIR)$(sbindir)/$$file;	\
+		if [ -e $$lnk ]; then			\
+			echo "Skipping $$lnk exists.";	\
+		else					\
+			$(LN_S) finit $$lnk;		\
+		fi;					\
+	done
+	@for file in $(REBOOT_LNKS); do			\
+		lnk=$(DESTDIR)$(sbindir)/$$file;	\
+		if [ -e $$lnk ]; then			\
+			echo "Skipping $$lnk exists.";	\
+		else					\
+			$(LN_S) initctl $$lnk;		\
+		fi;					\
 	done
-	@if [ -L $(DESTDIR)$(sbindir)/reboot ]; then		\
-		echo "Non-finit reboot, skipping install.";	\
-	else							\
-		for file in $(REBOOT_LNKS); do			\
-			lnk=$(DESTDIR)$(sbindir)/$$file;	\
-			if [ -e $$lnk ]; then			\
-				echo "Skipping $$lnk exists.";	\
-			else					\
-				$(LN_S) reboot $$lnk;		\
-			fi;					\
-		done;						\
-	fi
 
 uninstall-hook:
 	@$(RM) $(DESTDIR)$(pkglibdir)/rescue.conf
-	@for file in $(INIT_LNKS); do				\
-		lnk=`readlink $(DESTDIR)$(sbindir)/$$file`;	\
-		if [ "$$lnk" != "finit" ]; then			\
-			echo "Skipping non-finit $$file.";	\
-			continue;				\
-		fi;						\
-		$(RM) $(DESTDIR)$(sbindir)/$$file;		\
+	@for file in $(INIT_LNKS); do			\
+		lnk=$(DESTDIR)$(sbindir)/$$file;	\
+		dst=`readlink $$lnk`;			\
+		if [ "$$dst" != "finit" ]; then		\
+			continue;			\
+		fi;					\
+		$(RM) $(DESTDIR)$(sbindir)/$$file;	\
+	done
+	@for file in $(REBOOT_LNKS); do			\
+	        lnk=$(DESTDIR)$(sbindir)/$$file;	\
+		dst=`readlink $$lnk`;			\
+		if [ "$$dst" != "initctl" ]; then 	\
+			continue; 			\
+		fi;					\
+		$(RM) $$lnk;				\
 	done
-	@if [ -L $(DESTDIR)$(sbindir)/reboot ]; then		\
-		echo "Non-finit reboot, skipping uninstall.";	\
-	else							\
-		for file in $(REBOOT_LNKS); do			\
-		        lnk=$(DESTDIR)$(sbindir)/$$file;	\
-			dst=`readlink $$lnk`;			\
-			if [ "$$dst" != "reboot" ]; then 	\
-				continue; 			\
-			fi;					\
-			$(RM) $$lnk;				\
-		done;						\
-	fi