update ChangeLog

This path should not be hard coded in the open call.
Linux prior to 2.4.19 did not have /proc/self/mounts, so for now I'm
making this value /proc/mounts everywhere, but that may change to
/proc/self/mounts on linux; I'm not sure we should care about <2.4.19.

X-Gentoo-Bug: 604646
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604646

Makefile

@@ -13,7 +13,7 @@ MK=			${TOP}/mk
 
 include ${TOP}/Makefile.inc
 
-SUBDIR=		conf.d etc init.d local.d man scripts sh src support sysctl.d
+SUBDIR=		conf.d etc init.d local.d man scripts sh src sysctl.d
 
 # Build pkgconfig or not
 MKPKGCONFIG?=	yes

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.28
+VERSION=	0.23.1
 PKG=		${NAME}-${VERSION}

NEWS.md

@@ -3,49 +3,6 @@
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
-## OpenRC-0.28
-
-This version mounts efivars read only due to concerns about changes in
-this file system making systems unbootable.  If you need to change something
-in this path, you will need to re-mount it read-write, make the change
-and re-mount it read-only.
-
-Also, you can override this behavior by adding a line for efivars to
-fstab if you want efivars mounted read-write.
-
-For more information on this issue, see the following url:
-
-https://github.com/openrc/openrc/issues/134
-
-## OpenRC-0.25
-
-This version contains an OpenRC-specific implementation of init for
-Linux which can be used in place of sysvinit or any other init process.
-For information on its usage, see the man pages for openrc-init (8) and
-openrc-shutdown (8).
-
-## OpenRC-0.24.1
-
-This version starts cleaning up the dependencies so that rc_parallel
-will work correctly.
-
-The first step in this process is to remove the 'before *' from the
-depend functions in the clock services. This means some  services not
-controlled by OpenRC may now start before instead of after the clock
-service. If it is important for these services to start after the clock
-service, they need to have 'after clock' added to their depend
-functions.
-
-## OpenRC-0.24
-
-Since the deptree2dot tool and the perl requirement are completely
-optional, the deptree2dot tool has been moved to the support directory.
-As a result, the MKTOOLS=yes/no switch has been removed from the makefiles.
-
-This version adds the agetty service which can be used to spawn
-agetty on a specific terminal. This is currently documented in the
-agetty-guide.md file at the top level of this distribution.
-
 ## OpenRC-0.23
 
 The tmpfiles.d processing code, which was part of previous versions of

README.md

@@ -28,9 +28,9 @@ MKPREFIX=yes
 MKPKGCONFIG=no
 MKSELINUX=yes
 MKSTATICLIBS=no
-MKSYSVINIT=yes
 MKTERMCAP=ncurses
 MKTERMCAP=termcap
+MKTOOLS=yes
 PKG_PREFIX=/usr/pkg
 LOCAL_PREFIX=/usr/local
 PREFIX=/usr/local
@@ -73,6 +73,10 @@ Obviously, if you're installing this onto a system that does not use
 OpenRC by default then you may wish to backup the above listed files,
 remove them and then install so that the OS hooks into OpenRC.
 
+`init.d.misc` is not installed by default as the scripts will need
+tweaking on a per distro basis. They are also non essential to the
+operation of the system.
+
 ## Reporting Bugs
 
 If you are using Gentoo Linux, bugs can be filed on their bugzilla under

agetty-guide.md

@@ -1,18 +0,0 @@
-# Setting up the agetty service in OpenRC
-
-The agetty service is an OpenRC specific way to monitor and respawn a
-getty, using agetty, on Linux. To use this method, make sure you aren't
-spawning a getty manager for this port some other way (such as through
-sysvinit/inittab), then run the following commands as root.
-
-Note that [port] refers to the port you are spawning the getty on, for
-example, tty1 or ttyS0. The full path to it, for example, /dev/tty1
-should not be used.
-
-```
-# cd /etc/init.d
-# ln -s agetty agetty.[port]
-# cd /etc/conf.d
-# cp agetty agetty.[port]
-#rc-update add agetty.[port] [runlevel]
-```

conf.d/Makefile

@@ -12,8 +12,8 @@ include ${MK}/os.mk
 
 CONF-FreeBSD=	ipfw modules moused powerd rarpd savecore syscons
 
-CONF-Linux=	agetty consolefont devfs dmesg hwclock keymaps killprocs modules \
+CONF-Linux=	consolefont devfs dmesg hwclock keymaps killprocs modules mtab \
-	mtab net-online
+	net-online
 
 CONF-NetBSD=	moused rarpd savecore
 

conf.d/agetty

@@ -1,8 +0,0 @@
-# Set the baud rate of the terminal line
-#baud=""
-
-# set the terminal type
-#term_type="linux"
-
-# extra options to pass to agetty for this port
-#agetty_options=""

conf.d/killprocs

@@ -1,6 +1,3 @@
-# If you wish to pass any options to kill_all during shutdown,
+# If you wish to pass any options to killall5 during shutdown,
 # you should do so here.
-#
-# The setting is called killall5_opts because the options here are meant
-# to be identical to those you could pass to killall5.
 killall5_opts=""

conf.d/net-online

@@ -3,13 +3,10 @@
 # default is all interfaces that support ethernet.
 #interfaces=""
 
-# This setting controls whether a ping test is included in the test for
+# This setting controls whether a ping to the default gateway is
-# network connectivity after all interfaces are active.
+# included in the test for network connectivity after all interfaces
-#include_ping_test=no
+# are active.
-
+#ping_default_gateway=no
-# This setting is the host to attempt to ping if the above is yes.
-# The default is google.com.
-#ping_test_host=some.host.name
 
 # The timeout setting controls how long the net-online service waits
 # for the network to be configured.

etc/rc.conf

@@ -178,11 +178,6 @@
 # "xenU"           - XenU Domain (Linux and NetBSD)
 #rc_sys=""
 
-# if  you use openrc-init, which is currently only available on Linux,
-# this is the default runlevel to activate after "sysinit" and "boot"
-# when booting.
-#rc_default_runlevel="default"
-
 # on Linux and Hurd, this is the number of ttys allocated for logins
 # It is used in the consolefont, keymaps, numlock and termencoding
 # service scripts.

guide.md

@@ -198,7 +198,7 @@ script:
 command=
 command_args=
 pidfile=
-```
+``
 
 Thus the 'smallest' service scripts can be half a dozen lines long
 

init.d.misc/Makefile

@@ -1,11 +1,9 @@
-DIR=	${DATADIR}/support/init.d.examples
+DIR=	${INITDIR}
-INC=	README.md
 SRCS=	avahi-dnsconfd.in avahid.in dhcpcd.in dbus.in \
 	hald.in named.in ntpd.in \
 	openvpn.in polkitd.in sshd.in wpa_supplicant.in
-BIN=	${OBJS}
 
-MK=	../../mk
+MK=	../mk
 
 SED_EXTRA+= -e 's:@VARBASE@:/var:g'
 

init.d/.gitignore

@@ -1,4 +1,3 @@
-agetty
 binfmt
 modules-load
 bootmisc

init.d/Makefile

@@ -19,11 +19,11 @@ SRCS-FreeBSD=	hostid.in modules.in moused.in newsyslog.in pf.in rarpd.in \
 		rc-enabled.in rpcbind.in savecore.in syslogd.in
 # These are FreeBSD specific
 SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
-		modules-load.in mixer.in nscd.in powerd.in syscons.in
+		modules.in modules-load.in mixer.in nscd.in powerd.in syscons.in
 
-SRCS-Linux=	agetty.in binfmt.in devfs.in dmesg.in hwclock.in consolefont.in \
+SRCS-Linux=	binfmt.in devfs.in dmesg.in hwclock.in consolefont.in keymaps.in \
-	keymaps.in killprocs.in modules.in modules-load.in mount-ro.in mtab.in \
+		killprocs.in modules.in modules-load.in mount-ro.in mtab.in numlock.in \
-	numlock.in procfs.in net-online.in sysfs.in termencoding.in
+		procfs.in net-online.in sysfs.in termencoding.in
 
 # Generic BSD scripts
 SRCS-NetBSD=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \

init.d/adjkerntz.in

@@ -23,7 +23,6 @@ fi
 
 depend()
 {
-	after swclock
 	provide clock
 	# BSD adjkerntz needs to be able to write to /etc
 	if [ "$clock" = "UTC" -a -e /etc/wall_cmos_clock ] ||

init.d/agetty.in

@@ -1,32 +0,0 @@
-#!@SBINDIR@/openrc-run
-# Copyright (c) 2017 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-description="start agetty on a terminal line"
-supervisor=supervise-daemon
-port="${RC_SVCNAME#*.}"
-term_type="${term_type:-linux}"
-command=/sbin/agetty
-command_args_foreground="${agetty_options} ${port} ${baud} ${term_type}"
-pidfile="/run/${RC_SVCNAME}.pid"
-
-depend() {
-	after local
-	keyword -prefix
-}
-
-start_pre() {
-	if [ -z "$port" ]; then
-		eerror "${RC_SVCNAME} cannot be started directly. You must create"
-		eerror "symbolic links to it for the ports you want to start"
-		eerror "agetty on and add those to the appropriate runlevels."
-		return 1
-	fi
-}

init.d/binfmt.in

@@ -13,7 +13,7 @@ description="Register misc binary format handlers"
 
 depend()
 {
-	after clock procfs
+	after procfs
 	use modules devfs
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }

init.d/bootmisc.in

@@ -71,8 +71,7 @@ cleanup_var_run_dir()
 	ebegin "Cleaning /var/run"
 	for x in $(find /var/run ! -type d ! -name utmp \
 		! -name random-seed ! -name dev.db \
-		! -name ld-elf.so.hints ! -name ld-elf32.so.hints \
+		! -name ld-elf.so.hints ! -name ld.so.hints);
-		! -name ld.so.hints);
 	do
 		# Clean stale sockets
 		if [ -S "$x" ]; then
@@ -241,7 +240,7 @@ stop()
 {
 	# Write a halt record if we're shutting down
 	if [ "$RC_RUNLEVEL" = shutdown ]; then
-		[ "$RC_UNAME" = Linux ] && openrc-shutdown -w
+		[ "$RC_UNAME" = Linux ] && halt -w
 		if [ "$RC_SYS" = OPENVZ ]; then
 			yesno $RC_REBOOT && printf "" >/reboot
 		fi

init.d/devdb.in

@@ -13,7 +13,6 @@ description="Creates the dev database"
 
 depend()
 {
-	after clock
 	need localmount
 }
 

init.d/dumpon.in

@@ -12,7 +12,6 @@
 description="Configures a specific kernel dump device."
 
 depend() {
-	after clock
 	need swap
 	keyword -jail -prefix
 }

init.d/fsck.in

@@ -15,7 +15,6 @@ _IFS="
 
 depend()
 {
-	after clock
 	use dev clock modules
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -timeout -vserver -uml
 }

init.d/hostid.in

@@ -15,7 +15,6 @@ extra_commands="reset"
 depend()
 {
 	use root
-	after clock
 	before devd net
 	keyword -jail -prefix
 }

init.d/hostname.in

@@ -11,9 +11,7 @@
 
 description="Sets the hostname of the machine."
 
-depend()
+depend() {
-{
-	after clock
 	keyword -docker -lxc -prefix -systemd-nspawn
 }
 
@@ -21,12 +19,12 @@ start()
 {
 	local h source x
 	if [ -s @SYSCONFDIR@/hostname ] && [ -r @SYSCONFDIR@/hostname ]; then
-		read h x <@SYSCONFDIR@/hostname
+	read h x <@SYSCONFDIR@/hostname
-		source="from @SYSCONFDIR@/hostname"
+	source=" from @SYSCONFDIR@/hostname"
 	else
 		# HOSTNAME variable used to be defined in caps in conf.d/hostname.
 		# It is also a magic variable in bash.
-		h=${hostname:-${HOSTNAME}} # checkbashisms: false positive (HOSTNAME var)
+		h=${hostname-${HOSTNAME}} # checkbashisms: false positive
 	fi
 	if [ -z "$h" ]; then
 		einfo "Using default system hostname"

init.d/hwclock.in

@@ -33,6 +33,8 @@ depend()
 	want modules
 	if yesno $clock_adjfile; then
 		use root
+	else
+		before *
 	fi
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }

init.d/keymaps.in

@@ -14,7 +14,7 @@ description="Applies a keymap for the consoles."
 depend()
 {
 	need localmount termencoding
-	after bootmisc clock
+	after bootmisc
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 

init.d/killprocs.in

@@ -19,9 +19,9 @@ depend()
 start()
 {
 	ebegin "Terminating remaining processes"
-	kill_all 15 ${killall5_opts}
+	killall5 -15 ${killall5_opts}
 	eend 0
 	ebegin "Killing remaining processes"
-	kill_all 9 ${killall5_opts}
+	killall5 -9 ${killall5_opts}
 	eend 0
 }

init.d/localmount.in

@@ -14,8 +14,8 @@ description="Mounts disks and swap according to /etc/fstab."
 depend()
 {
 	need fsck
-	use lvm modules mtab root
+	use lvm modules mtab
-	after clock lvm modules root
+	after lvm modules
 	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 

init.d/loopback.in

@@ -13,7 +13,6 @@ description="Configures the loopback interface."
 
 depend()
 {
-	after clock
 	keyword -jail -prefix -systemd-nspawn -vserver
 }
 

init.d/mount-ro.in

@@ -13,7 +13,7 @@ description="Re-mount filesytems read-only for a clean reboot."
 
 depend()
 {
-	after killprocs savecache
+	need killprocs savecache
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 

init.d/mtab.in

@@ -13,7 +13,6 @@ description="Update /etc/mtab to match what the kernel knows about"
 
 depend()
 {
-	after clock
 	need root
 	keyword -prefix -systemd-nspawn
 }

init.d/net-online.in

@@ -15,7 +15,6 @@ depend()
 {
 	after modules
 	need sysfs
-	provide network-online
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
 }
 
@@ -28,6 +27,19 @@ get_interfaces()
 	done
 }
 
+get_default_gateway()
+{
+	local cmd gateway
+	if command -v ip > /dev/null 2>&1; then
+		cmd="ip route show"
+	else
+		cmd=route
+	fi
+	set -- $($cmd | grep default)
+	[ "$2" != via ] && gateway="$2" || gateway="$3"
+	printf "%s" $gateway
+}
+
 start ()
 {
 	local carriers configured dev gateway ifcount infinite
@@ -54,15 +66,10 @@ start ()
 	: $((timeout -= 1))
  done
  ! $infinite && [ $timeout -eq 0 ] && rc=1
- include_ping_test=${include_ping_test:-${ping_default_gateway}}
+ if [ $rc -eq 0 ] && yesno ${ping_default_gateway:-no}; then
- if [ -n "${ping_default_gateway}" ]; then
+ 	gateway="$(get_default_gateway)"
- ewarn "ping_default_gateway is deprecated, please use include_ping_test"
+ 	if [ -n "$gateway" ] && ! ping -c 1 $gateway > /dev/null 2>&1; then
- fi
+		rc=1
- if [ $rc -eq 0 ] && yesno ${include_ping_test:-no}; then
- 	ping_test_host="${ping_test_host:-google.com}"
- 	if [ -n "$ping_test_host" ]; then
-		ping -c 1 $ping_test_host > /dev/null 2>&1
-		rc=$?
 	fi
  fi
  eend $rc "The network is offline"

init.d/netmount.in

@@ -20,12 +20,10 @@ depend()
 			*) mywant="$mywant nfsclient"; break ;;
 		esac
 	done
-	after root
  	config /etc/fstab
 	want $mywant
 	use afc-client amd openvpn
 	use dns
-	use root
 	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 

init.d/network.in

@@ -18,7 +18,7 @@ __nl="
 depend()
 {
 	need localmount
-	after bootmisc clock
+	after bootmisc
 	if [ -n "$(interfaces)" ]; then
 		provide net
 	fi

init.d/newsyslog.in

@@ -13,7 +13,6 @@ required_files="/etc/newsyslog.conf"
 
 depend()
 {
-	after clock
 	need localmount
 	keyword -prefix
 }

init.d/procfs.in

@@ -13,7 +13,6 @@ description="Mounts misc filesystems in /proc."
 
 depend()
 {
-	after clock
 	use devfs
 	want modules
 	need localmount

init.d/root.in

@@ -13,7 +13,6 @@ description="Mount the root fs read/write"
 
 depend()
 {
-	after clock
 	need fsck
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }

init.d/savecore.in

@@ -14,7 +14,6 @@ description="Saves a kernel dump."
 depend()
 {
 	need dumpon localmount
-	after clock
 	before encswap
 	keyword -jail -prefix
 }

init.d/staticroute.in

@@ -1,4 +1,4 @@
-S#!@BINDIR@/openrc-run
+#!@SBINDIR@/openrc-run
 # Copyright (c) 2009-2015 The OpenRC Authors.
 # See the Authors file at the top-level directory of this distribution and
 # https://github.com/OpenRC/openrc/blob/master/AUTHORS
@@ -14,9 +14,9 @@ S#!@BINDIR@/openrc-run
 description="Configures static routes."
 __nl="
 "
+
 depend()
 {
-	after clock
 	provide net
 	use network
 	keyword -jail -prefix -vserver

init.d/swap-blk.in

@@ -11,7 +11,6 @@
 
 depend()
 {
-	after clock
 	before fsck
 	keyword -jail -prefix
 }

init.d/swap.in

@@ -11,7 +11,6 @@
 
 depend()
 {
-	after clock
 	before localmount
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }

init.d/swclock.in

@@ -13,6 +13,7 @@ description="Sets the local clock to the mtime of a given file."
 
 depend()
 {
+	before *
 	provide clock
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }

init.d/syscons.in

@@ -10,7 +10,6 @@
 # except according to the terms contained in the LICENSE file.
 
 depend() {
-	after clock
 	need localmount
 	keyword -jail -prefix
 }

init.d/sysctl.in

@@ -11,7 +11,6 @@
 
 depend()
 {
-	after clock
 	before bootmisc logger
 	keyword -prefix -systemd-nspawn -vserver
 }

init.d/sysfs.in

@@ -15,6 +15,7 @@ sysfs_opts=nodev,noexec,nosuid
 
 depend()
 {
+	want modules
 	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
@@ -98,12 +99,23 @@ mount_misc()
 	fi
 
 	# set up kernel support for efivarfs
-	if [ -d /sys/firmware/efi/efivars ] &&
+	# The presence of /sys/firmware/efi indicates that the system was
-		! mountinfo -q /sys/firmware/efi/efivars; then
+	# booted in efi mode.
-		ebegin "Mounting efivarfs filesystem"
+	if [ -d /sys/firmware/efi ]; then
-		mount -n -t efivarfs -o ro \
+		if [ ! -d /sys/firmware/efi/efivars ] &&
-			efivarfs /sys/firmware/efi/efivars 2> /dev/null
+			modprobe -q efivarfs; then
-		eend 0
+			ewarn "The efivarfs module needs to be configured in " \
+				  "@SYSCONFDIR@/conf.d/modules or built in"
+		fi
+		if [ -d /sys/firmware/efi/efivars ] &&
+			! mountinfo -q /sys/firmware/efi/efivars; then
+			if grep -qs efivarfs /proc/filesystems; then
+				ebegin "Mounting efivarfs filesystem"
+				mount -n -t efivarfs -o ${sysfs_opts} \
+					efivarfs /sys/firmware/efi/efivars
+				eend $?
+			fi
+		fi
 	fi
 }
 

init.d/syslogd.in

@@ -22,6 +22,6 @@ depend()
 	provide logger
 	use net newsyslog
 	need localmount
-	after bootmisc clock
+	after bootmisc
 	keyword -prefix
 }

init.d/termencoding.in

@@ -18,7 +18,7 @@ depend()
 {
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 	use root
-	after bootmisc clock
+	after bootmisc
 }
 
 start()

init.d/ttys.in

@@ -11,7 +11,7 @@
 
 depend()
 {
-	after clock fsck
+	after fsck
 	keyword -prefix
 }
 

init.d/urandom.in

@@ -14,7 +14,6 @@ description="Initializes the random number generator."
 
 depend()
 {
-	after clock
 	need localmount
 	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn
 }

init.d/wscons.in

@@ -11,7 +11,6 @@
 
 depend()
 {
-	after clock
 	need localmount
 	keyword -prefix
 }

man/Makefile

@@ -9,7 +9,7 @@ MAN8=		rc-service.8 rc-status.8 rc-update.8 openrc.8 openrc-run.8 \
 		service.8 start-stop-daemon.8 supervise-daemon.8
 
 ifeq (${OS},Linux)
-MAN8 += rc-sstat.8 openrc-init.8 openrc-shutdown.8
+MAN8 += rc-sstat.8
 endif
 
 # Handy macro to create symlinks

man/openrc-init.8

@@ -1,46 +0,0 @@
-.\" Copyright (c) 2017 The OpenRC Authors.
-.\" See the Authors file at the top-level directory of this distribution and
-.\" https://github.com/OpenRC/openrc/blob/master/AUTHORS
-.\"
-.\" This file is part of OpenRC. It is subject to the license terms in
-.\" the LICENSE file found in the top-level directory of this
-.\" distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-.\" This file may not be copied, modified, propagated, or distributed
-.\"    except according to the terms contained in the LICENSE file.
-.\"
-.Dd April 6, 2017
-.Dt openrc-init 8 SMM
-.Os OpenRC
-.Sh NAME
-.Nm openrc-init
-.Nd the parent of all processes
-.Sh SYNOPSIS
-.Nm
-.Sh DESCRIPTION
-.Nm
-is an init process which can be an alternative to sysvinit or any other
-init process.
-.Pp
-To use
-.Nm
-configure your boot loader to invoke it or symlink it to /sbin/init.
-Also, you will need to use
-.Xr openrc-shutdown 8 ,
-to halt, reboot or poweroff the system.
-.Pp
-The default runlevel is read from the init command line, the
-rc_default_runlevel setting in rc.conf, the kernel command line, or it is
-assumed to be "default" if it is not set in any of these places.
-.Pp
-.Nm
-doesn't manage getty's directly, so you will need to manage them another
-way. For example, you can use the agetty service script as described in
-agetty-guide.md in this distribution.
-.Sh BUGS
-This was first released as part of OpenRC 0.25.
-I do not know of any specific issues. However, since this is the first
-release of openrc-init, please test and report any issues you find.
-.Sh SEE ALSO
-.Xr openrc-shutdown 8 ,
-.Sh AUTHORS
-.An William Hubbs <w.d.hubbs@gmail.com>

man/openrc-run.8

@@ -167,24 +167,6 @@ Display name used for the above defined command.
 Process name to match when signaling the daemon.
 .It Ar stopsig
 Signal to send when stopping the daemon.
-.It Ar respawn_delay
-Respawn delay
-.Xr supervise-daemon 8
-will use for this daemon.  See
-.Xr supervise-daemon 8
-for more information about this setting.
-.It Ar respawn_max
-Respawn max
-.Xr supervise-daemon 8
-will use for this daemon.  See
-.Xr supervise-daemon 8
-for more information about this setting.
-.It Ar respawn_period
-Respawn period
-.Xr supervise-daemon 8
-will use for this daemon.  See
-.Xr supervise-daemon 8
-for more information about this setting.
 .It Ar retry
 Retry schedule to use when stopping the daemon. It can either be a
 timeout in seconds or multiple signal/timeout pairs (like SIGTERM/5).
@@ -412,25 +394,25 @@ If -d, -f or -p is specified, checkpath checks to see if the path
 exists, is the right type and has the correct owner and access modes. If
 any of these tests fail, the path is created and set up as specified. If
 more than one of -d, -f or -p are specified, the last one will be used.
-.Pp
+
 The argument to -m is a three or four digit octal number. If this option
 is not provided, the value defaults to 0644 for files and 0775 for
 directories.
-.Pp
+
 The argument to -o is a representation of the user and/or group which
 should own the path. The user and group can be represented numerically
 or with names, and are separated by a colon.
-.Pp
+
 The truncate options (-D and -F) cause the directory or file to be
 cleared of all contents.
-.Pp
+
 If -W is specified, checkpath checks to see if the first path given on
 the command line is writable.  This is different from how the test
 command in the shell works, because it also checks to make sure the file
 system is not read only.
-.Pp
+
 Also, the -d, -f or -p options should not be specified along with this option.
-.Pp
+
 The -q option suppresses all informational output. If it is specified
 twice, all error messages are suppressed as well.
 .It Ic yesno Ar value

man/openrc-shutdown.8

@@ -1,62 +0,0 @@
-.\" Copyright (c) 2017 The OpenRC Authors.
-.\" See the Authors file at the top-level directory of this distribution and
-.\" https://github.com/OpenRC/openrc/blob/master/AUTHORS
-.\"
-.\" This file is part of OpenRC. It is subject to the license terms in
-.\" the LICENSE file found in the top-level directory of this
-.\" distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-.\" This file may not be copied, modified, propagated, or distributed
-.\"    except according to the terms contained in the LICENSE file.
-.\"
-.Dd May 22, 2017
-.Dt openrc-shutdown 8 SMM
-.Os OpenRC
-.Sh NAME
-.Nm openrc-shutdown
-.Nd bring the system down
-.Sh SYNOPSIS
-.Nm
-.Op Fl d , -no-write
-.Op Fl D , -dry-run
-.Op Fl H , -halt
-.Op Fl k , -kexec
-.Op Fl p , -poweroff
-.Op Fl R , -reexec
-.Op Fl r , -reboot
-.Op Fl s , -single
-.Op Fl w , -write-only
-.Sh DESCRIPTION
-.Nm
-is the utility that communicates with
-.Xr openrc-init 8
-to bring down the system or instruct openrc-init to re-execute itself.
-It supports the following options:
-.Bl -tag -width "poweroff"
-.It Fl d , -no-write
-Do not write the wtmp boot record.
-.It Fl D , -dry-run
-Print the action that would be taken without executing it. This is to
-allow testing.
-.It Fl H , -halt
-Stop all services, kill all remaining processes and halt the system.
-.It Fl k , -kexec
-Stop all services, kill all processes and boot directly into a new
-kernel loaded via
-.Xr kexec 8 .
-.It Fl p , -poweroff
-Stop all services, kill all processes and power off the system.
-.It Fl R , -reexec
-instruct openrc-init to re-exec itself. This should be used after an
-upgrade of OpenRC if you are using openrc-init as your init process.
-.It Fl r , -reboot
-Stop all services, kill all processes and reboot the system.
-.It Fl s , -single
-Stop all services, kill all processes and move to single user mode.
-.It Fl w , -write-only
-Stop all services, kill all processes and move to single user mode.
-.El
-.Sh SEE ALSO
-.Xr openrc-init 8 ,
-.Xr kexec 8 ,
-.Sh AUTHORS
-.An William Hubbs <w.d.hubbs@gmail.com>

man/rc-status.8

@@ -25,12 +25,6 @@ in different runlevels.  The default behavior is to show information
 about the current runlevel and any unassigned services that are not stopped,
 but any runlevel can be quickly examined.
 .Pp
-If an active service is being supervised by
-.Xr supervise-daemon 8, 
-the amount of time the daemon has been active along with the number of
-times it has been respawned in the current respawn period will be
-displayed.
-.Pp
 The options are as follows:
 .Bl -tag -width ".Fl test , test string"
 .It Fl a , -all
@@ -63,6 +57,5 @@ dependency order if the dependency tree is available.
 .Sh SEE ALSO
 .Xr openrc 8 ,
 .Xr rc-update 8
-.Xr supervise-daemon 8
 .Sh AUTHORS
 .An Roy Marples <roy@marples.name>

man/supervise-daemon.8

@@ -16,8 +16,6 @@
 .Nd starts a daemon and restarts it if it crashes
 .Sh SYNOPSIS
 .Nm
-.Fl D , -respawn-delay
-.Ar seconds
 .Fl d , -chdir
 .Ar path
 .Fl e , -env
@@ -28,18 +26,14 @@
 .Ar arg
 .Fl k , -umask
 .Ar value
-.Fl m , -respawn-max
-.Ar count
 .Fl N , -nicelevel
 .Ar level
 .Fl p , -pidfile
 .Ar pidfile
-.Fl P , -respawn-period
-.Ar seconds
-.Fl r , -chroot
-.Ar chrootpath
 .Fl u , -user
 .Ar user
+.Fl r , -chroot
+.Ar chrootpath
 .Fl 1 , -stdout
 .Ar logfile
 .Fl 2 , -stderr
@@ -88,9 +82,6 @@ Print the action(s) that are taken just before doing them.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
-.It Fl D , -respawn-delay Ar seconds
-wait this number of seconds before restarting a daemon after it crashes.
-The default is 0.
 .It Fl d , -chdir Ar path
 chdir to this directory before starting the daemon.
 .It Fl e , -env Ar VAR=VALUE
@@ -103,18 +94,8 @@ Class can be 0 for none, 1 for real time, 2 for best effort and 3 for idle.
 Data can be from 0 to 7 inclusive.
 .It Fl k , -umask Ar mode
 Set the umask of the daemon.
-.It Fl m , -respawn-max Ar count
-Sets the maximum number of times a daemon will be respawned during a
-respawn period. If a daemon dies more than this number of times during a
-respawn period,
-.Nm
-will give up trying to respawn it and exit. The default is 10, and 0
-means unlimited.
 .It Fl N , -nicelevel Ar level
 Modifies the scheduling priority of the daemon.
-.It Fl P , -respawn-period Ar seconds
-Sets the length of a respawn period. The default is 10 seconds. See the
-description of --respawn-max for more information.
 .It Fl r , -chroot Ar path
 chroot to this directory before starting the daemon. All other paths, such
 as the path to the daemon, chdir and pidfile, should be relative to the chroot.
@@ -130,7 +111,6 @@ The same thing as
 .Fl 1 , -stdout
 but with the standard error output.
 .El
-.El
 .Sh ENVIRONMENT
 .Va SSD_NICELEVEL
 can also set the scheduling priority of the daemon, but the command line
@@ -143,15 +123,6 @@ to parse its options, which allows it to accept the `--' option which will
 cause it to stop processing options at that point. Any subsequent arguments
 are passed as arguments to the daemon to start and used when finding a daemon
 to stop or signal.
-.Sh NOTE
-If respawn-delay, respawn-max and respawn-period are not set correctly,
-it is possible to trigger a situation in which the supervisor will
-infinitely try to respawn a daemon. To avoid this, if you change the
-values of --respawn-delay, --respawn-max or --respawn-period, always
-make sure the settings mmake sense. For example, a respawn period of 5
-seconds with a respawn max of 10 and a respawn delay of 1 second leads
-to infinite respawning since there can never be 10 respawns within 5
-seconds.
 .Sh SEE ALSO
 .Xr chdir 2 ,
 .Xr chroot 2 ,

mk/cc.mk

@@ -26,8 +26,7 @@ _CCFLAGS=	-Wall -Wextra -Wimplicit -Wshadow -Wformat=2 \
 		-Wnested-externs \
 		-Winline -Wwrite-strings -Wcast-align -Wcast-qual \
 		-Wpointer-arith \
-		-Wdeclaration-after-statement -Wsequence-point \
+		-Wdeclaration-after-statement -Wsequence-point
-		-Werror=implicit-function-declaration
 
 # We should be using -Wredundant-decls, but our library hidden proto stuff
 # gives loads of warnings. I don't fully understand it (the hidden proto,

mk/os-GNU.mk

@@ -11,5 +11,5 @@
 SFX=		.GNU.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -DMAXPATHLEN=4096 -DPATH_MAX=4096
+CPPFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=700 -DMAXPATHLEN=4096 -DPATH_MAX=4096
 LIBDL=		-Wl,-Bdynamic -ldl

mk/os-Linux.mk

@@ -11,7 +11,7 @@
 SFX=		.Linux.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700
+CPPFLAGS+=	-D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700
 LIBDL=		-Wl,-Bdynamic -ldl
 
 ifeq (${MKSELINUX},yes)

mk/sys.mk

@@ -59,9 +59,6 @@ MANPREFIX?=		${UPREFIX}/share
 MANDIR?=		${MANPREFIX}/man
 MANMODE?=		0444
 
-DATADIR?=		${UPREFIX}/share/openrc
-DATAMODE?=		0644
-
 DOCDIR?=		${UPREFIX}/share/doc
 DOCMODE?=		0644
 

scripts/.gitignore

@@ -1,5 +1 @@
-halt
-poweroff
 rc-sstat
-reboot
-shutdown

scripts/Makefile

@@ -8,23 +8,12 @@ INSTALLAFTER = _installafter
 ifeq (${OS},Linux)
 SRCS+= rc-sstat.in
 BIN+=	rc-sstat
-ifeq (${MKSYSVINIT},yes)
-SRCS+= halt.in poweroff.in reboot.in shutdown.in
-BIN+=	halt poweroff reboot shutdown
-	endif
 endif
 
 _installafter:
 ifeq (${OS},Linux)
 	${INSTALL} -d ${DESTDIR}${SBINDIR}
-	ln -sf ${DIR}/rc-sstat ${DESTDIR}/${SBINDIR}/rc-sstat
+	ln -s ${DIR}/rc-sstat ${DESTDIR}/${SBINDIR}/rc-sstat
-ifeq (${MKSYSVINIT},yes)
-	ln -sf	${DIR}/halt ${DESTDIR}/${SBINDIR}/halt
-	ln -sf	${DIR}/poweroff ${DESTDIR}/${SBINDIR}/poweroff
-	ln -sf	${DIR}/reboot ${DESTDIR}/${SBINDIR}/reboot
-	ln -sf	${DIR}/shutdown ${DESTDIR}/${SBINDIR}/shutdown
-	ln -sf	openrc-init ${DESTDIR}/${SBINDIR}/init
-endif
 endif
 
 include ${MK}/scripts.mk

scripts/halt.in

@@ -1,24 +0,0 @@
-#!@SHELL@
-
-option_arg=
-poweroff_arg=
-while getopts :nwdfiph opt; do
-	case "$opt" in
-		n) ;;
-		w) poweroff_arg=--write-only ;;
-		d) option_arg=--no-write ;;
-		f) ;;
-		i) ;;
-		p) poweroff_arg=--poweroff ;;
-		[?]) printf "%s\n" "${0##*/}: invalid command line option" >&2
-		exit 1
-		;;
-	esac
-done
-shift $((OPTIND-1))
-
-if [ -z "${poweroff_arg}" ]; then
-	poweroff_arg=--poweroff
-fi
-
-exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "$@"

scripts/poweroff.in

@@ -1,23 +0,0 @@
-#!@SHELL@
-
-option_arg=
-poweroff_arg=
-while getopts :nwdfiph opt; do
-	case "$opt" in
-		n) ;;
-		w) poweroff_arg=--write-only ;;
-		d) option_arg=--no-write ;;
-		f) ;;
-		i) ;;
-		[?]) printf "%s\n" "${0##*/}: invalid command line option" >&2
-		exit 1
-		;;
-	esac
-done
-shift $((OPTIND-1))
-
-if [ -z "${poweroff_arg}" ]; then
-	poweroff_arg=--poweroff
-fi
-
-exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "$@"

scripts/reboot.in

@@ -1,25 +0,0 @@
-#!@SHELL@
-
-option_arg=
-poweroff_arg=
-while getopts :nwdfhik opt; do
-	case "$opt" in
-		n) ;;
-		w) poweroff_arg=--write-only ;;
-		d) option_arg=--no-write ;;
-		f) ;;
-		h) ;;
-		i) ;;
-		k) poweroff_arg=--kexec ;;
-		[?]) printf "%s\n" "${0##*/}: invalid command line option" >&2
-		exit 1
-		;;
-	esac
-done
-shift $((OPTIND-1))
-
-if [ -z "${poweroff_arg}" ]; then
-	poweroff_arg=--reboot
-fi
-
-exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "$@"

scripts/shutdown.in

@@ -1,29 +0,0 @@
-#!@SHELL@
-
-shutdown_arg=
-while getopts :akrhPHfFnct: opt; do
-	case "$opt" in
-		a) ;;
-		k) ;;
-		r) shutdown_arg=--reboot ;;
-		h) shutdown_arg=--halt ;;
-		P) shutdown_arg=--poweroff ;;
-		H) shutdown_arg=--halt ;;
-		f) ;;
-		F) ;;
-		n) ;;
-		c) ;;
-		t) ;;
-		[?]) printf "%s\n" "${0##*/}: invalid command line option" >&2
-		exit 1
-		;;
-	esac
-done
-shift $((OPTIND-1))
-
-if [ -z "${shutdown_arg}" ]; then
-	shutdown_arg=--single
-fi
-
-echo @SBINDIR@/openrc-shutdown ${shutdown_arg} "$@"
-exec @SBINDIR@/openrc-shutdown ${shutdown_arg} "$@"

sh/gendepends.sh.in

@@ -74,22 +74,11 @@ do
 
 		# Only generate dependencies for OpenRC scripts
 		read one two three <"$RC_SERVICE"
-		case "$one" in
+		[ "$one" = "#!@SBINDIR@/runscript" ] || \
-			\#*/openrc-run) ;;
+		[ "$one" = "#!@SBINDIR@/openrc-run" ] || \
-			\#*/runscript) ;;
+		[ "$one" = "#!" -a "$two" = "@SBINDIR@/runscript" ] || \
-			\#!)
+		[ "$one" = "#!" -a "$two" = "@SBINDIR@/openrc-run" ] || \
-				case "$two" in
+			continue
-					*/openrc-run) ;;
-					*/runscript) ;;
-					*)
-						continue
-						;;
-				esac
-				;;
-			*)
-				continue
-				;;
-		esac
 		unset one two three
 
 		RC_SVCNAME=${RC_SERVICE##*/} ; export RC_SVCNAME

sh/rc-functions.sh.in

@@ -85,40 +85,6 @@ get_bootparam()
 	return 1
 }
 
-get_bootparam_value()
-{
-	local match="$1" which_value="$2" sep="$3" result value
-	if [ -n "$match" -a -r /proc/cmdline ]; then
-		set -- $(cat /proc/cmdline)
-		while [ -n "$1" ]; do
-			case "$1" in
-				$match=*)
-					value="${1##*=}"
-					case "$which_value" in
-						all)
-							[ -z "$sep" ] && sep=' '
-							if [ -z "$result" ]; then
-								result="$value"
-							else
-								result="${result}${sep}${value}"
-							fi
-							;;
-						last)
-							result="$value"
-							;;
-						*)
-							result="$value"
-							break
-							;;
-					esac
-					;;
-			esac
-			shift
-		done
-	fi
-	echo $result
-}
-
 # Called from openrc-run.sh or gendepends.sh
 _get_containers() {
 	local c

sh/supervise-daemon.sh

@@ -25,9 +25,6 @@ supervise_start()
 	eval supervise-daemon --start \
 		${chroot:+--chroot} $chroot \
 		${pidfile:+--pidfile} $pidfile \
-		${respawn_delay:+--respawn-delay} $respawn_delay \
-		${respawn_max:+--respawn-max} $respawn_max \
-		${respawn_period:+--respawn-period} $respawn_period \
 		${command_user+--user} $command_user \
 		$supervise_daemon_args \
 		$command \

src/Makefile

@@ -3,5 +3,9 @@
 
 SUBDIR=		test libeinfo librc rc
 
+ifeq (${MKTOOLS},yes)
+SUBDIR+= tools
+endif
+
 MK=		../mk
 include		${MK}/subdir.mk

src/includes/rc-misc.h

@@ -23,7 +23,6 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "helpers.h"
@@ -69,7 +68,5 @@ RC_DEPTREE *_rc_deptree_load (int, int *);
 bool _rc_can_find_pids(void);
 
 RC_SERVICE lookup_service_state(const char *service);
-void from_time_t(char *time_string, time_t tv);
-time_t to_time_t(char *timestring);
 
 #endif

src/includes/rc-wtmp.h

@@ -1,26 +0,0 @@
-/*
- * rc-wtmp.h
- * This is private to us and not for user consumption
-*/
-
-/*
- * Copyright (c) 2017 The OpenRC Authors.
- * See the Authors file at the top-level directory of this distribution and
- * https://github.com/OpenRC/openrc/blob/master/AUTHORS
- *
- * This file is part of OpenRC. It is subject to the license terms in
- * the LICENSE file found in the top-level directory of this
- * distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
- * This file may not be copied, modified, propagated, or distributed
- *    except according to the terms contained in the LICENSE file.
- */
-
-#ifndef __RC_WTMP_H__
-#define __RC_WTMP_H__
-
-#include <utmp.h>
-
-void log_wtmp(const char *user, const char *id, pid_t pid, int type,
-		const char *line);
-
-#endif

src/librc/rc.h.in

@@ -39,7 +39,6 @@ extern "C" {
 #define RC_CONFDIR              RC_SYSCONFDIR "/conf.d"
 #define RC_PLUGINDIR            RC_LIBDIR "/plugins"
 
-#define RC_INIT_FIFO RC_SVCDIR"/init.ctl"
 #define RC_PROFILE_ENV     RC_SYSCONFDIR "/profile.env"
 #define RC_SYS_WHITELIST   RC_LIBEXECDIR "/conf.d/env_whitelist"
 #define RC_USR_WHITELIST   RC_SYSCONFDIR "/conf.d/env_whitelist"

src/rc/.gitignore

@@ -59,7 +59,4 @@ mark_service_failed
 rc-abort
 rc
 openrc
-openrc-init
 openrc-run
-openrc-shutdown
-kill_all

src/rc/Makefile

@@ -1,7 +1,3 @@
-include ../../Makefile.inc
-MK=		../../mk
-include ${MK}/os.mk
-
 SRCS=	checkpath.c do_e.c do_mark_service.c do_service.c \
 		do_value.c fstabinfo.c is_newer_than.c is_older_than.c \
 		mountinfo.c openrc-run.c rc-abort.c rc.c \
@@ -13,10 +9,6 @@ ifeq (${MKSELINUX},yes)
 SRCS+=		rc-selinux.c
 endif
 
-ifeq (${OS},Linux)
-SRCS+=		kill_all.c openrc-init.c openrc-shutdown.c rc-wtmp.c
-endif
-
 CLEANFILES=	version.h rc-selinux.o
 
 BINDIR=		${PREFIX}/bin
@@ -42,12 +34,6 @@ RC_SBINPROGS=	mark_service_starting mark_service_started \
 		mark_service_inactive mark_service_wasinactive \
 		mark_service_hotplugged mark_service_failed \
 		rc-abort swclock
-
-ifeq (${OS},Linux)
-RC_BINPROGS+= kill_all
-SBINPROGS+= openrc-init openrc-shutdown
-endif
-
 ALL_PROGS=	${BINPROGS} ${SBINPROGS} ${RC_BINPROGS} ${RC_SBINPROGS}
 CLEANFILES+=	${ALL_PROGS}
 
@@ -55,6 +41,8 @@ LOCAL_CPPFLAGS=-I../includes -I../librc -I../libeinfo
 LOCAL_LDFLAGS=-L../librc -L../libeinfo
 LDADD+=		-lutil -lrc -leinfo
 
+include ../../Makefile.inc
+MK=		../../mk
 include ${MK}/prog.mk
 include ${MK}/gitver.mk
 include ${MK}/cc.mk
@@ -100,9 +88,6 @@ checkpath: rc-selinux.o
 endif
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
-kill_all: kill_all.o _usage.o
-	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
-
 einfon einfo ewarnn ewarn eerrorn eerror ebegin eend ewend \
 eindent eoutdent esyslog eval_ecolors ewaitfile \
 veinfo vewarn vebegin veend vewend veindent veoutdent: do_e.o rc-misc.o
@@ -111,9 +96,6 @@ veinfo vewarn vebegin veend vewend veindent veoutdent: do_e.o rc-misc.o
 fstabinfo: fstabinfo.o _usage.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
-openrc-init: openrc-init.o rc-wtmp.o
-	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
-
 is_newer_than: is_newer_than.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
@@ -132,9 +114,6 @@ mountinfo: mountinfo.o _usage.o rc-misc.o
 openrc rc: rc.o rc-logger.o rc-misc.o rc-plugin.o _usage.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
-openrc-shutdown: openrc-shutdown.o _usage.o rc-wtmp.o
-	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
-
 openrc-run runscript: openrc-run.o _usage.o rc-misc.o rc-plugin.o
 ifeq (${MKSELINUX},yes)
 openrc-run runscript: rc-selinux.o

src/rc/kill_all.c

@@ -1,251 +0,0 @@
-/*
- * kill_all.c
- * Sends a signal to all processes on the system.
- */
-
-/*
- * Copyright (c) 2017 The OpenRC Authors.
- * See the Authors file at the top-level directory of this distribution and
- * https://github.com/OpenRC/openrc/blob/master/AUTHORS
- *
- * This file is part of OpenRC. It is subject to the license terms in
- * the LICENSE file found in the top-level directory of this
- * distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
- * This file may not be copied, modified, propagated, or distributed
- *    except according to the terms contained in the LICENSE file.
- */
-
-
-#include <dirent.h>
-#include <errno.h>
-#include <getopt.h>
-#include <limits.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include "einfo.h"
-#include "rc.h"
-#include "rc-misc.h"
-#include "_usage.h"
-
-const char *applet = NULL;
-const char *extraopts = "[signal number]";
-const char *getoptstring = "do:" getoptstring_COMMON;
-const struct option longopts[] = {
-	{ "dry-run",        0, NULL, 'd' },
-	{ "omit",        1, NULL, 'o' },
-	longopts_COMMON
-};
-const char * const longopts_help[] = {
-	"print what would be done",
-	"omit this pid (can be repeated)",
-	longopts_help_COMMON
-};
-const char *usagestring = NULL;
-
-static int mount_proc(void)
-{
-	pid_t pid;
-	pid_t rc;
-	int status;
-
-	if (exists("/proc/version"))
-		return 0;
-	pid = fork();
-	switch(pid) {
-		case -1:
-			syslog(LOG_ERR, "Unable to fork");
-			return -1;
-			break;
-		case 0:
-			/* attempt to mount /proc */
-			execl("mount", "mount", "-t", "proc", "proc", "/proc", NULL);
-			syslog(LOG_ERR, "Unable to execute mount");
-			exit(1);
-			break;
-		default:
-			/* wait for child process */
-			while ((rc = wait(&status)) != pid)
-				if (rc < 0 && errno == ECHILD)
-					break;
-			if (rc != pid || WEXITSTATUS(status) != 0)
-				syslog(LOG_ERR, "mount returned non-zero exit status");
-			break;
-	}
-	if (! exists("/proc/version")) {
-		syslog(LOG_ERR, "Could not mount /proc");
-		return -1;
-	}
-	return 0;
-}
-
-static bool is_user_process(pid_t pid)
-{
-	char buf[PATH_MAX+1];
-	FILE *fp;
-	char path[PATH_MAX+1];
-	pid_t temp_pid;
-	bool user_process = true;
-
-	while (pid >0 && user_process) {
-		if (pid == 2) {
-			user_process = false;
-			continue;
-		}
-		snprintf(path, sizeof(path), "/proc/%d/status", pid);
-		fp = fopen(path, "r");
-		/*
-		 * if we could not open the file, the process disappeared, which
-		 * leaves us no way to determine for sure whether it was a user
-		 * process or kernel thread, so we say it is a kernel thread to
-		 * avoid accidentally killing it.
-		 */
-		if (!fp) {
-			user_process = false;
-			continue;
-		}
-		temp_pid = -1;
-		while (! feof(fp)) {
-			buf[0] = 0;
-			if (fgets(buf, sizeof(buf), fp))
-				sscanf(buf, "PPid: %d", &temp_pid);
-			else
-				break;
-		}
-		fclose(fp);
-		if (temp_pid == -1) {
-			syslog(LOG_ERR, "Unable to read pid from /proc/%d/status", pid);
-			user_process = false;
-			continue;
-		}
-		pid = temp_pid;
-	}
-	return user_process;
-}
-
-static int signal_processes(int sig, RC_STRINGLIST *omits, bool dryrun)
-{
-	sigset_t signals;
-	sigset_t oldsigs;
-	DIR *dir;
-	struct dirent	*d;
-	char buf[PATH_MAX+1];
-	pid_t pid;
-	int sendcount = 0;
-
-	kill(-1, SIGSTOP);
-	sigfillset(&signals);
-	sigemptyset(&oldsigs);
-	sigprocmask(SIG_SETMASK, &signals, &oldsigs);
-	/*
-	 * Open the /proc directory.
-	 * CWD must be /proc to avoid problems if / is affected by the killing
-	 * (i.e. depends on fuse).
-	 */
-	if (chdir("/proc") == -1) {
-		syslog(LOG_ERR, "chdir /proc failed");
-		sigprocmask(SIG_SETMASK, &oldsigs, NULL);
-		kill(-1, SIGCONT);
-		return -1;
-	}
-	dir = opendir(".");
-	if (!dir) {
-		syslog(LOG_ERR, "cannot opendir(/proc)");
-		sigprocmask(SIG_SETMASK, &oldsigs, NULL);
-		kill(-1, SIGCONT);
-		return -1;
-	}
-
-	/* Walk through the directory. */
-	while ((d = readdir(dir)) != NULL) {
-		/* Is this a process? */
-		pid = (pid_t) atoi(d->d_name);
-		if (pid == 0)
-			continue;
-
-		/* Is this a process we have been requested to omit? */
-		sprintf(buf, "%d", pid);
-		if (rc_stringlist_find(omits, buf))
-			continue;
-
-		/* Is this process in our session? */
-		if (getsid(getpid()) == getsid(pid))
-			continue;
-
-		/* Is this a kernel thread? */
-		if (!is_user_process(pid))
-			continue;
-
-		if (dryrun)
-			einfo("Would send signal %d to process %d", sig, pid);
-		else if (kill(pid, sig) == 0)
-			sendcount++;
-	}
-	closedir(dir);
-	sigprocmask(SIG_SETMASK, &oldsigs, NULL);
-	kill(-1, SIGCONT);
-	return sendcount;
-}
-
-int main(int argc, char **argv)
-{
-	char *arg = NULL;
-	int opt;
-	bool dryrun = false;
-	RC_STRINGLIST *omits = rc_stringlist_new();
-	int sig = SIGKILL;
-	char *here;
-	char *token;
-
-	/* Ensure that we are only quiet when explicitly told to be */
-	unsetenv("EINFO_QUIET");
-
-	applet = basename_c(argv[0]);
-	rc_stringlist_addu(omits, "1");
-	while ((opt = getopt_long(argc, argv, getoptstring,
-		    longopts, (int *) 0)) != -1)
-	{
-		switch (opt) {
-			case 'd':
-				dryrun = true;
-				break;
-			case 'o':
-				here = optarg;
-				while ((token = strsep(&here, ",;:"))) {
-					if ((pid_t) atoi(token) > 0)
-						rc_stringlist_addu(omits, token);
-					else {
-						eerror("Invalid omit pid value %s", token);
-						usage(EXIT_FAILURE);
-					}
-				}
-				break;
-			case_RC_COMMON_GETOPT
-		}
-	}
-
-	if (argc > optind) {
-	arg = argv[optind];
-	sig = atoi(arg);
-	if (sig <= 0 || sig > 31) {
-		rc_stringlist_free(omits);
-		eerror("Invalid signal %s", arg);
-		usage(EXIT_FAILURE);
-	}
-	}
-	
-	openlog(applet, LOG_CONS|LOG_PID, LOG_DAEMON);
-	if (mount_proc() != 0) {
-		rc_stringlist_free(omits);
-		eerrorx("Unable to mount /proc file system");
-	}
-	signal_processes(sig, omits, dryrun);
-	rc_stringlist_free(omits);
-	return 0;
-}

src/rc/openrc-init.c

@@ -1,218 +0,0 @@
-/*
- * openrc-init.c
- * This is the init process (pid 1) for OpenRC.
- *
- * This is based on code written by James Hammons <jlhamm@acm.org>, so
- * I would like to publically thank him for his work.
- */
-
-/*
- * Copyright (c) 2017 The OpenRC Authors.
- * See the Authors file at the top-level directory of this distribution and
- * https://github.com/OpenRC/openrc/blob/master/AUTHORS
- *
- * This file is part of OpenRC. It is subject to the license terms in
- * the LICENSE file found in the top-level directory of this
- * distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
- * This file may not be copied, modified, propagated, or distributed
- *    except according to the terms contained in the LICENSE file.
- */
-
-#include <errno.h>
-#include <signal.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/reboot.h>
-#include <sys/wait.h>
-
-#include "helpers.h"
-#include "rc.h"
-#include "rc-wtmp.h"
-#include "version.h"
-
-static const char *rc_default_runlevel = "default";
-
-static pid_t do_openrc(const char *runlevel)
-{
-	pid_t pid;
-	sigset_t signals;
-
-	pid = fork();
-	switch(pid) {
-		case -1:
-			perror("fork");
-			break;
-		case 0:
-			setsid();
-			/* unblock all signals */
-			sigemptyset(&signals);
-			sigprocmask(SIG_SETMASK, &signals, NULL);
-			printf("Starting %s runlevel\n", runlevel);
-			execl("/sbin/openrc", "/sbin/openrc", runlevel, NULL);
-			perror("exec");
-			break;
-		default:
-			break;
-	}
-	return pid;
-}
-
-static void init(const char *default_runlevel)
-{
-	const char *runlevel = NULL;
-	pid_t pid;
-
-	pid = do_openrc("sysinit");
-	waitpid(pid, NULL, 0);
-	pid = do_openrc("boot");
-	waitpid(pid, NULL, 0);
-	if (default_runlevel)
-		runlevel = default_runlevel;
-	else
-		runlevel = rc_conf_value("rc_default_runlevel");
-	if (!runlevel)
-		runlevel = rc_default_runlevel;
-	if (!rc_runlevel_exists(runlevel)) {
-		printf("%s is an invalid runlevel\n", runlevel);
-		runlevel = rc_default_runlevel;
-	}
-	pid = do_openrc(runlevel);
-	waitpid(pid, NULL, 0);
-	log_wtmp("reboot", "~~", 0, RUN_LVL, "~~");
-}
-
-static void handle_reexec(char *my_name)
-{
-	execl(my_name, my_name, "reexec", NULL);
-	return;
-}
-
-static void handle_shutdown(const char *runlevel, int cmd)
-{
-	pid_t pid;
-
-	pid = do_openrc(runlevel);
-	while (waitpid(pid, NULL, 0) != pid);
-	printf("Sending the final term signal\n");
-	kill(-1, SIGTERM);
-	sleep(3);
-	printf("Sending the final kill signal\n");
-	kill(-1, SIGKILL);
-	sync();
-	reboot(cmd);
-}
-
-static void handle_single(void)
-{
-	pid_t pid;
-
-	pid = do_openrc("single");
-	while (waitpid(pid, NULL, 0) != pid);
-}
-
-static void reap_zombies(void)
-{
-	pid_t pid;
-
-	for (;;) {
-		pid = waitpid(-1, NULL, WNOHANG);
-		if (pid == 0)
-			break;
-		else if (pid == -1) {
-			if (errno == ECHILD)
-				break;
-			perror("waitpid");
-			continue;
-		}
-	}
-}
-
-static void signal_handler(int sig)
-{
-	switch(sig) {
-		case SIGINT:
-			handle_shutdown("reboot", RB_AUTOBOOT);
-			break;
-		case SIGCHLD:
-			reap_zombies();
-			break;
-		default:
-			printf("Unknown signal received, %d\n", sig);
-			break;
-	}
-}
-
-int main(int argc, char **argv)
-{
-	char *default_runlevel;
-	char buf[2048];
-	int count;
-	FILE *fifo;
-	bool reexec = false;
-	sigset_t signals;
-	struct sigaction sa;
-
-	if (getpid() != 1)
-		return 1;
-
-	printf("OpenRC init version %s starting\n", VERSION);
-
-	if (argc > 1)
-		default_runlevel = argv[1];
-	else
-		default_runlevel = NULL;
-
-	if (default_runlevel && strcmp(default_runlevel, "reexec") == 0)
-		reexec = true;
-
-	/* block all signals we do not handle */
-	sigfillset(&signals);
-	sigdelset(&signals, SIGCHLD);
-	sigdelset(&signals, SIGINT);
-	sigprocmask(SIG_SETMASK, &signals, NULL);
-
-	/* install signal  handler */
-	memset(&sa, 0, sizeof(sa));
-	sa.sa_handler = signal_handler;
-	sigaction(SIGCHLD, &sa, NULL);
-	sigaction(SIGINT, &sa, NULL);
-	reboot(RB_DISABLE_CAD);
-
-	if (! reexec)
-		init(default_runlevel);
-
-	if (mkfifo(RC_INIT_FIFO, 0600) == -1 && errno != EEXIST)
-		perror("mkfifo");
-
-	for (;;) {
-		/* This will block until a command is sent down the pipe... */
-		fifo = fopen(RC_INIT_FIFO, "r");
-		if (!fifo) {
-			if (errno != EINTR)
-				perror("fopen");
-			continue;
-		}
-		count = fread(buf, 1, sizeof(buf) - 1, fifo);
-		buf[count] = 0;
-		fclose(fifo);
-		printf("PID1: Received \"%s\" from FIFO...\n", buf);
-		if (strcmp(buf, "halt") == 0)
-			handle_shutdown("shutdown", RB_HALT_SYSTEM);
-		else if (strcmp(buf, "kexec") == 0)
-			handle_shutdown("reboot", RB_KEXEC);
-		else if (strcmp(buf, "poweroff") == 0)
-			handle_shutdown("shutdown", RB_POWER_OFF);
-		else if (strcmp(buf, "reboot") == 0)
-			handle_shutdown("reboot", RB_AUTOBOOT);
-		else if (strcmp(buf, "reexec") == 0)
-			handle_reexec(argv[0]);
-		else if (strcmp(buf, "single") == 0)
-			handle_single();
-	}
-	return 0;
-}

src/rc/openrc-shutdown.c

@@ -1,170 +0,0 @@
-/*
- * openrc-shutdown.c
- * If you are using OpenRC's provided init, this will shut down or
- * reboot your system.
- *
- * This is based on code written by James Hammons <jlhamm@acm.org>, so
- * I would like to publically thank him for his work.
- */
-
-/*
- * Copyright 2017 The OpenRC Authors.
- * See the Authors file at the top-level directory of this distribution and
- * https://github.com/OpenRC/openrc/blob/master/AUTHORS
- *
- * This file is part of OpenRC. It is subject to the license terms in
- * the LICENSE file found in the top-level directory of this
- * distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
- * This file may not be copied, modified, propagated, or distributed
- *    except according to the terms contained in the LICENSE file.
- */
-
-#include <getopt.h>
-#include <signal.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/utsname.h>
-
-#include "einfo.h"
-#include "rc.h"
-#include "helpers.h"
-#include "_usage.h"
-#include "rc-wtmp.h"
-
-const char *applet = NULL;
-const char *extraopts = NULL;
-const char *getoptstring = "dDHKpRrsw" getoptstring_COMMON;
-const struct option longopts[] = {
-	{ "no-write",        no_argument, NULL, 'd'},
-	{ "dry-run",        no_argument, NULL, 'D'},
-	{ "halt",        no_argument, NULL, 'H'},
-	{ "kexec",        no_argument, NULL, 'K'},
-	{ "poweroff",        no_argument, NULL, 'p'},
-	{ "reexec",        no_argument, NULL, 'R'},
-	{ "reboot",        no_argument, NULL, 'r'},
-	{ "single",        no_argument, NULL, 's'},
-	{ "write-only",        no_argument, NULL, 'w'},
-	longopts_COMMON
-};
-const char * const longopts_help[] = {
-	"do not write wtmp record",
-	"print actions instead of executing them",
-	"halt the system",
-	"reboot the system using kexec",
-	"power off the system",
-	"re-execute init (use after upgrading)",
-	"reboot the system",
-	"single user mode",
-	"write wtmp boot record and exit",
-	longopts_help_COMMON
-};
-const char *usagestring = NULL;
-const char *exclusive = "Select one of "
-"--halt, --kexec, --poweroff, --reexec, --reboot, --single or --write-only";
-
-static bool do_dryrun = false;
-static bool do_halt = false;
-static bool do_kexec = false;
-static bool do_poweroff = false;
-static bool do_reboot = false;
-static bool do_reexec = false;
-static bool do_single = false;
-static bool do_wtmp = true;
-static bool do_wtmp_only = false;
-
-static void send_cmd(const char *cmd)
-{
-	FILE *fifo;
- 	size_t ignored;
-
-	if (do_dryrun) {
-		einfo("Would send %s to init", cmd);
-		return;
-	}
-	if (do_wtmp && (do_halt || do_kexec || do_reboot || do_poweroff))
-		log_wtmp("shutdown", "~~", 0, RUN_LVL, "~~");
-	fifo = fopen(RC_INIT_FIFO, "w");
-	if (!fifo) {
-		perror("fopen");
-		return;
-	}
-
-	ignored = fwrite(cmd, 1, strlen(cmd), fifo);
-	if (ignored != strlen(cmd))
-		printf("Error writing to init fifo\n");
-	fclose(fifo);
-}
-
-int main(int argc, char **argv)
-{
-	int opt;
-	int cmd_count = 0;
-
-	applet = basename_c(argv[0]);
-	while ((opt = getopt_long(argc, argv, getoptstring,
-		    longopts, (int *) 0)) != -1)
-	{
-		switch (opt) {
-			case 'd':
-				do_wtmp = false;
-				break;
-		case 'D':
-			do_dryrun = true;
-			break;
-		case 'H':
-			do_halt = true;
-			cmd_count++;
-			break;
-		case 'K':
-			do_kexec = true;
-			cmd_count++;
-			break;
-		case 'p':
-			do_poweroff = true;
-			cmd_count++;
-			break;
-		case 'R':
-			do_reexec = true;
-			cmd_count++;
-			break;
-		case 'r':
-			do_reboot = true;
-			cmd_count++;
-			break;
-		case 's':
-			do_single = true;
-			cmd_count++;
-			break;
-		case 'w':
-			do_wtmp_only = true;
-			cmd_count++;
-			break;
-		case_RC_COMMON_GETOPT
-		}
-	}
-	if (geteuid() != 0 && ! do_dryrun)
-		eerrorx("%s: you must be root\n", applet);
-	if (cmd_count != 1) {
-		eerror("%s: %s\n", applet, exclusive);
-		usage(EXIT_FAILURE);
-	}
-	if (do_halt)
-		send_cmd("halt");
-	else if (do_kexec)
-		send_cmd("kexec");
-	else if (do_poweroff)
-		send_cmd("poweroff");
-	else if (do_reboot)
-		send_cmd("reboot");
-	else if (do_reexec)
-		send_cmd("reexec");
-	else if (do_wtmp_only)
-		log_wtmp("shutdown", "~~", 0, RUN_LVL, "~~");
-	else if (do_single)
-		send_cmd("single");
-	return 0;
-}

src/rc/rc-logger.c

@@ -261,12 +261,12 @@ rc_logger_open(const char *level)
 						break;
 					}
 				}
-				fclose(log);
 			} else {
 				log_error = 1;
 				eerror("Error: fopen(%s) failed: %s", TMPLOG, strerror(errno));
 			}
 
+			fclose(log);
 			fclose(plog);
 		} else {
 			/*

src/rc/rc-misc.c

@@ -442,35 +442,3 @@ RC_SERVICE lookup_service_state(const char *service)
 			return service_bits[i].bit;
 	return 0;
 }
-
-void from_time_t(char *time_string, time_t tv)
-{
-	strftime(time_string, 20, "%Y-%m-%d %H:%M:%S", localtime(&tv));
-}
-
-time_t to_time_t(char *timestring)
-{
-	int check = 0;
-	int year = 0;
-	int month = 0;
-	int day = 0;
-	int hour = 0;
-	int min = 0;
-	int sec = 0;
-	struct tm breakdown = {0};
-	time_t result = -1;
-
-	check = sscanf(timestring, "%4d-%2d-%2d %2d:%2d:%2d",
-			&year, &month, &day, &hour, &min, &sec);
-	if (check == 6) {
-		breakdown.tm_year = year - 1900; /* years since 1900 */
-		breakdown.tm_mon = month - 1;
-		breakdown.tm_mday = day;
-		breakdown.tm_hour = hour;
-		breakdown.tm_min = min;
-		breakdown.tm_sec = sec;
-		breakdown.tm_isdst = -1;
-		result = mktime(&breakdown);
-	}
-	return result;
-}

src/rc/rc-status.c

@@ -76,58 +76,10 @@ print_level(const char *prefix, const char *level)
 		printf("%s\n", level);
 }
 
-static void get_uptime(const char *service, char *uptime, int uptime_size)
-{
-	RC_SERVICE state = rc_service_state(service);
-	char *start_count;
-	time_t now;
-	char *start_time_string;
-	time_t start_time;
-	time_t time_diff;
-	time_t diff_days = (time_t) 0;
-	time_t diff_hours = (time_t) 0;
-	time_t diff_mins = (time_t) 0;
-	time_t diff_secs = (time_t) 0;
-
-	uptime[0] = '\0';
-	if (state & RC_SERVICE_STARTED) {
-		start_count = rc_service_value_get(service, "start_count");
-		start_time_string = rc_service_value_get(service, "start_time");
-		if (start_count && start_time_string) {
-			start_time = to_time_t(start_time_string);
-			now = time(NULL);
-			time_diff = (time_t) difftime(now, start_time);
-			diff_secs = time_diff;
-			if (diff_secs > (time_t) 86400) {
-				diff_days = diff_secs / (time_t) 86400;
-				diff_secs %= diff_days * (time_t) 86400;
-			}
-			if (diff_secs > (time_t) 3600) {
-				diff_hours = diff_secs / (time_t) 3600;
-				diff_secs %= diff_hours * (time_t) 3600;
-			}
-			if (diff_secs > (time_t) 60) {
-				diff_mins = diff_secs / (time_t) 60;
-				diff_secs %= diff_mins * (time_t) 60;
-			}
-			if (diff_days > 0)
-				snprintf(uptime, uptime_size,
-						"%ld day(s) %02ld:%02ld:%02ld (%s)",
-						diff_days, diff_hours, diff_mins, diff_secs,
-						start_count);
-			else
-				snprintf(uptime, uptime_size,
-						"%02ld:%02ld:%02ld (%s)",
-						diff_hours, diff_mins, diff_secs, start_count);
-		}
-	}
-}
-
 static void
 print_service(const char *service)
 {
-	char status[60];
+	char status[10];
-	char uptime [40];
 	int cols =  printf(" %s", service);
 	const char *c = ecolor(ECOLOR_GOOD);
 	RC_SERVICE state = rc_service_state(service);
@@ -149,8 +101,7 @@ print_service(const char *service)
 		{
 			snprintf(status, sizeof(status), " crashed ");
 		} else {
-			get_uptime(service, uptime, 40);
+			snprintf(status, sizeof(status), " started ");
-			snprintf(status, sizeof(status), " started %s", uptime);
 			color = ECOLOR_GOOD;
 		}
 	} else if (state & RC_SERVICE_SCHEDULED) {

src/rc/rc-wtmp.c

@@ -1,51 +0,0 @@
-/*
- * rc-wtmp.c
- * This file contains routines to deal with the wtmp file.
- */
-
-/*
- * Copyright 2017 The OpenRC Authors.
- * See the Authors file at the top-level directory of this distribution and
- * https://github.com/OpenRC/openrc/blob/master/AUTHORS
- *
- * This file is part of OpenRC. It is subject to the license terms in
- * the LICENSE file found in the top-level directory of this
- * distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
- * This file may not be copied, modified, propagated, or distributed
- *    except according to the terms contained in the LICENSE file.
- */
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/utsname.h>
-
-#include "rc-wtmp.h"
-
-void log_wtmp(const char *user, const char *id, pid_t pid, int type,
-		const char *line)
-{
-	struct timeval tv;
-	struct utmp utmp;
-	struct utsname uname_buf;
-
-	memset(&utmp, 0, sizeof(utmp));
-	gettimeofday(&tv, NULL);
-	utmp.ut_tv.tv_sec = tv.tv_sec;
-	utmp.ut_tv.tv_usec = tv.tv_usec;
-	utmp.ut_pid  = pid;
-	utmp.ut_type = type;
-	strncpy(utmp.ut_name, user, sizeof(utmp.ut_name));
-	strncpy(utmp.ut_id  , id  , sizeof(utmp.ut_id  ));
-	strncpy(utmp.ut_line, line, sizeof(utmp.ut_line));
-        
-        /* Put the OS version in place of the hostname */
-        if (uname(&uname_buf) == 0)
-		strncpy(utmp.ut_host, uname_buf.release, sizeof(utmp.ut_host));
-
-	updwtmp(WTMP_FILE, &utmp);
-}

src/rc/start-stop-daemon.c

@@ -197,45 +197,26 @@ parse_signal(const char *sig)
 		int signal;
 	} SIGNALPAIR;
 
-#define signalpair_item(name) { #name, SIG##name },
-
 	static const SIGNALPAIR signallist[] = {
-		signalpair_item(HUP)
+		{ "ABRT",	SIGABRT	},
-		signalpair_item(INT)
+		{ "ALRM",	SIGALRM	},
-		signalpair_item(QUIT)
+		{ "FPE",	SIGFPE	},
-		signalpair_item(ILL)
+		{ "HUP",	SIGHUP	},
-		signalpair_item(TRAP)
+		{ "ILL",	SIGILL	},
-		signalpair_item(ABRT)
+		{ "INT",	SIGINT	},
-		signalpair_item(BUS)
+		{ "KILL",	SIGKILL	},
-		signalpair_item(FPE)
+		{ "PIPE",	SIGPIPE	},
-		signalpair_item(KILL)
+		{ "QUIT",	SIGQUIT	},
-		signalpair_item(USR1)
+		{ "SEGV",	SIGSEGV	},
-		signalpair_item(SEGV)
+		{ "TERM",	SIGTERM	},
-		signalpair_item(USR2)
+		{ "USR1",	SIGUSR1	},
-		signalpair_item(PIPE)
+		{ "USR2",	SIGUSR2	},
-		signalpair_item(ALRM)
+		{ "CHLD",	SIGCHLD	},
-		signalpair_item(TERM)
+		{ "CONT",	SIGCONT	},
-		signalpair_item(CHLD)
+		{ "STOP",	SIGSTOP	},
-		signalpair_item(CONT)
+		{ "TSTP",	SIGTSTP	},
-		signalpair_item(STOP)
+		{ "TTIN",	SIGTTIN	},
-		signalpair_item(TSTP)
+		{ "TTOU",	SIGTTOU	},
-		signalpair_item(TTIN)
-		signalpair_item(TTOU)
-		signalpair_item(URG)
-		signalpair_item(XCPU)
-		signalpair_item(XFSZ)
-		signalpair_item(VTALRM)
-		signalpair_item(PROF)
-#ifdef SIGWINCH
-		signalpair_item(WINCH)
-#endif
-#ifdef SIGIO
-		signalpair_item(IO)
-#endif
-#ifdef SIGPWR
-		signalpair_item(PWR)
-#endif
-		signalpair_item(SYS)
 		{ "NULL",	0 },
 	};
 
@@ -960,9 +941,6 @@ int main(int argc, char **argv)
 		if (redirect_stdout || redirect_stderr)
 			eerrorx("%s: --stdout and --stderr are only relevant"
 			    " with --start", applet);
-		if (start_wait)
-			ewarn("using --wait with --stop has no effect,"
-			    " use --retry instead");
 	} else {
 		if (!exec)
 			eerrorx("%s: nothing to start", applet);
@@ -1015,11 +993,7 @@ int main(int argc, char **argv)
 		eerror("%s: %s does not exist", applet,
 		    *exec_file ? exec_file : exec);
 		exit(EXIT_FAILURE);
-
 	}
-	if (start && retry)
-		ewarn("using --retry with --start has no effect,"
-		    " use --wait instead");
 
 	/* If we don't have a pidfile we should check if it's interpreted
 	 * or not. If it we, we need to pass the interpreter through

src/rc/supervise-daemon.c

@@ -66,42 +66,36 @@ static struct pam_conv conv = { NULL, NULL};
 
 const char *applet = NULL;
 const char *extraopts = NULL;
-const char *getoptstring = "D:d:e:g:I:Kk:m:N:p:r:Su:1:2:" \
+const char *getoptstring = "d:e:g:I:Kk:N:p:r:Su:1:2:" \
 	getoptstring_COMMON;
 const struct option longopts[] = {
-	{ "respawn-delay",        1, NULL, 'D'},
 	{ "chdir",        1, NULL, 'd'},
 	{ "env",          1, NULL, 'e'},
 	{ "group",        1, NULL, 'g'},
 	{ "ionice",       1, NULL, 'I'},
 	{ "stop",         0, NULL, 'K'},
 	{ "umask",        1, NULL, 'k'},
-	{ "respawn-max",    1, NULL, 'm'},
 	{ "nicelevel",    1, NULL, 'N'},
 	{ "pidfile",      1, NULL, 'p'},
-	{ "respawn-period",        1, NULL, 'P'},
+	{ "user",         1, NULL, 'u'},
 	{ "chroot",       1, NULL, 'r'},
 	{ "start",        0, NULL, 'S'},
-	{ "user",         1, NULL, 'u'},
 	{ "stdout",       1, NULL, '1'},
 	{ "stderr",       1, NULL, '2'},
 	longopts_COMMON
 };
 const char * const longopts_help[] = {
-	"Set a respawn delay",
 	"Change the PWD",
 	"Set an environment string",
 	"Change the process group",
 	"Set an ionice class:data when starting",
 	"Stop daemon",
 	"Set the umask for the daemon",
-	"set maximum number of respawn attempts",
 	"Set a nicelevel when starting",
 	"Match pid found in this file",
-	"Set respawn time period",
+	"Change the process user",
 	"Chroot to this directory",
 	"Start daemon",
-	"Change the process user",
 	"Redirect stdout to file",
 	"Redirect stderr to file",
 	longopts_help_COMMON
@@ -171,8 +165,7 @@ static pid_t get_pid(const char *pidfile)
 	return pid;
 }
 
-static void child_process(char *exec, char **argv, char *svcname,
+static void child_process(char *exec, char **argv)
-		int start_count)
 {
 	RC_STRINGLIST *env_list;
 	RC_STRING *env;
@@ -184,9 +177,6 @@ static void child_process(char *exec, char **argv, char *svcname,
 	char *np;
 	char **c;
 	char cmdline[PATH_MAX];
-	time_t start_time;
-	char start_count_string[20];
-	char start_time_string[20];
 
 #ifdef HAVE_PAM
 	pam_handle_t *pamh = NULL;
@@ -196,14 +186,6 @@ static void child_process(char *exec, char **argv, char *svcname,
 
 	setsid();
 
-	if (svcname) {
-start_time = time(NULL);
-from_time_t(start_time_string, start_time);
-		rc_service_value_set(svcname, "start_time", start_time_string);
-sprintf(start_count_string, "%i", start_count);
-		rc_service_value_set(svcname, "start_count", start_count_string);
-	}
-
 	if (nicelevel) {
 		if (setpriority(PRIO_PROCESS, getpid(), nicelevel) == -1)
 			eerrorx("%s: setpriority %d: %s", applet, nicelevel,
@@ -244,7 +226,6 @@ sprintf(start_count_string, "%i", start_count);
 	/* Close any fd's to the passwd database */
 	endpwent();
 
-	/* remove the controlling tty */
 #ifdef TIOCNOTTY
 	ioctl(tty_fd, TIOCNOTTY, 0);
 	close(tty_fd);
@@ -340,7 +321,7 @@ sprintf(start_count_string, "%i", start_count);
 		dup2(stderr_fd, STDERR_FILENO);
 
 	for (i = getdtablesize() - 1; i >= 3; --i)
-		fcntl(i, F_SETFD, FD_CLOEXEC);
+		close(i);
 
 	*cmdline = '\0';
 	c = argv;
@@ -442,14 +423,7 @@ int main(int argc, char **argv)
 	char *p;
 	char *token;
 	int i;
-	int n;
 	char exec_file[PATH_MAX];
-	int respawn_count = 0;
-	int respawn_delay = 0;
-	int respawn_max = 10;
-	int respawn_period = 5;
-	time_t respawn_now= 0;
-	time_t first_spawn= 0;
 	struct passwd *pw;
 	struct group *gr;
 	FILE *fp;
@@ -486,12 +460,6 @@ int main(int argc, char **argv)
 	while ((opt = getopt_long(argc, argv, getoptstring, longopts,
 		    (int *) 0)) != -1)
 		switch (opt) {
-		case 'D':  /* --respawn-delay time */
-			n = sscanf(optarg, "%d", &respawn_delay);
-			if (n	!= 1 || respawn_delay < 1)
-				eerrorx("Invalid respawn-delay value '%s'", optarg);
-			break;
-
 		case 'I': /* --ionice */
 			if (sscanf(optarg, "%d:%d", &ionicec, &ioniced) == 0)
 				eerrorx("%s: invalid ionice `%s'",
@@ -513,12 +481,6 @@ int main(int argc, char **argv)
 				    applet, optarg);
 			break;
 
-		case 'P':  /* --respawn-period time */
-			n = sscanf(optarg, "%d", &respawn_period);
-			if (n	!= 1 || respawn_delay < 1)
-				eerrorx("Invalid respawn-delay value '%s'", optarg);
-			break;
-
 		case 'S':  /* --start */
 			start = true;
 			break;
@@ -548,12 +510,6 @@ int main(int argc, char **argv)
 				    applet, optarg);
 			break;
 
-		case 'm':  /* --respawn-max count */
-			n = sscanf(optarg, "%d", &respawn_max);
-			if (n	!= 1 || respawn_max < 1)
-				eerrorx("Invalid respawn-max value '%s'", optarg);
-			break;
-
 		case 'p':  /* --pidfile <pid-file> */
 			pidfile = optarg;
 			break;
@@ -624,11 +580,6 @@ int main(int argc, char **argv)
 	if (start) {
 		if (!exec)
 			eerrorx("%s: nothing to start", applet);
-		if (respawn_delay * respawn_max > respawn_period) {
-			ewarn("%s: Please increase the value of --respawn-period to more "
-				"than %d to avoid infinite respawning", applet, 
-				respawn_delay * respawn_max);
-		}
 	}
 
 	/* Expand ~ */
@@ -688,12 +639,10 @@ int main(int argc, char **argv)
 		 * result would be the same. */
 		if (pidfile && exists(pidfile))
 			unlink(pidfile);
-		if (svcname) {
+		if (svcname)
 			rc_service_daemon_set(svcname, exec,
 			    (const char *const *)argv,
 			    pidfile, false);
-			rc_service_mark(svcname, RC_SERVICE_STOPPED);
-		}
 		exit(EXIT_SUCCESS);
 	}
 
@@ -725,10 +674,6 @@ int main(int argc, char **argv)
 	if (child_pid != 0)
 		exit(EXIT_SUCCESS);
 
-#ifdef TIOCNOTTY
-	tty_fd = open("/dev/tty", O_RDWR);
-#endif
-	devnull_fd = open("/dev/null", O_RDWR);
 	child_pid = fork();
 	if (child_pid == -1)
 		eerrorx("%s: fork: %s", applet, strerror(errno));
@@ -737,22 +682,18 @@ int main(int argc, char **argv)
 		/* this is the supervisor */
 		umask(numask);
 
+#ifdef TIOCNOTTY
+		tty_fd = open("/dev/tty", O_RDWR);
+#endif
+
+		devnull_fd = open("/dev/null", O_RDWR);
+
 		fp = fopen(pidfile, "w");
 		if (! fp)
 			eerrorx("%s: fopen `%s': %s", applet, pidfile, strerror(errno));
 		fprintf(fp, "%d\n", getpid());
 		fclose(fp);
 
-		if (svcname)
-			rc_service_daemon_set(svcname, exec,
-									(const char * const *) argv, pidfile, true);
-
-	/* remove the controlling tty */
-#ifdef TIOCNOTTY
-		ioctl(tty_fd, TIOCNOTTY, 0);
-		close(tty_fd);
-#endif
-
 		/*
 		 * Supervisor main loop
 		 */
@@ -763,23 +704,6 @@ int main(int argc, char **argv)
 				syslog(LOG_INFO, "stopping %s, pid %d", exec, child_pid);
 				kill(child_pid, SIGTERM);
 			} else {
-				sleep(respawn_delay);
-				if (respawn_max > 0 && respawn_period > 0) {
-					respawn_now = time(NULL);
-					if (first_spawn == 0)
-						first_spawn = respawn_now;
-					if (respawn_now - first_spawn > respawn_period) {
-						respawn_count = 0;
-						first_spawn = 0;
-					} else
-						respawn_count++;
-					if (respawn_count >= respawn_max) {
-						syslog(LOG_INFO, "respawned \"%s\" too many times, "
-								"exiting", exec);
-						exiting = true;
-						continue;
-					}
-				}
 				if (WIFEXITED(i))
 					syslog(LOG_INFO, "%s, pid %d, exited with return code %d",
 							exec, child_pid, WEXITSTATUS(i));
@@ -790,19 +714,15 @@ int main(int argc, char **argv)
 				if (child_pid == -1)
 					eerrorx("%s: fork: %s", applet, strerror(errno));
 				if (child_pid == 0)
-					child_process(exec, argv, svcname, respawn_count);
+					child_process(exec, argv);
 			}
 		}
 
-		if (pidfile && exists(pidfile))
+		if (svcname)
-			unlink(pidfile);
-		if (svcname) {
 			rc_service_daemon_set(svcname, exec,
-			    (const char *const *)argv,
+									(const char * const *) argv, pidfile, true);
-			    pidfile, false);
+
-			rc_service_mark(svcname, RC_SERVICE_STOPPED);
-		}
 		exit(EXIT_SUCCESS);
 	} else if (child_pid == 0)
-		child_process(exec, argv, svcname, respawn_count);
+		child_process(exec, argv);
 }

src/tools/Makefile

@@ -0,0 +1,5 @@
+DIR=	${UPREFIX}/bin
+BIN=	deptree2dot
+
+MK=	../../mk
+include ${MK}/scripts.mk

support/Makefile

@@ -1,20 +0,0 @@
-# Copyright (c) 2017 the OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-MK=		../mk
-include		${MK}/os.mk
-
-SUBDIR=		deptree2dot init.d.examples openvpn
-
-ifeq (${OS},Linux)
-SUBDIR+=	sysvinit
-endif
-
-include		${MK}/subdir.mk