Update ChangeLog

ChangeLog

@@ -1,61 +1,20 @@
-commit 91109e31d81ecd48f5690ad6f63103fca545dec7
+commit c0303de1923940cdf4ba5921c1ec128cb0748559
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    update news
-
-commit 2b6eeea01d1c64d58929788f4bfa0758393885bf
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    man: remove service(8) man page
-
-commit a15de23e5713d840d871c526b46050983dc6ea1e
 Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
 
     typo fix
 
-commit efa9ba485d9328f780f3e60dc18339c75974c6c6
+commit 5443196bcdcd7c995d13d6822bcee50d0ab5e1be
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/sysfs.in: fix reference to RC_LIBEXECDIR
-    
-    The sysfs init script referred to @LIBEXECDIR@ before this change, but
-    it is better to refer to RC_LIBEXECDIR so that we get rid of a sed
-    substitution.
-
-commit d4ddd72701ff5533a1ba07b1da60806859c63d88
-Author: Chris Cromer <chris@cromer.cl>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    add option to make agetty startup quiet
-    
-    This fixes #150
-
-commit 1e9af2cd421423404ffe1491bd35af76c2885f1f
 Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
 
     fix compiler warning
 
-commit 3c05db74f6e733890e9035c183a774db3d512512
+commit df8a3008a1473ae7238483db7827cb63cfc39789
 Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
 
-    remove service binary
+    version 0.32.1
-    
-    The service binary was just a synonym for rc-service, so use rc-service
-    instead of service. If you want a "service" binary, it should be
-    something that can determine which service manager you are running and
-    run the appropriate service manager commands.
-
-commit edc54b03770d5f58d1a4969d06c28660003dfb04
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    version 0.33
 
 commit 8e53a3fa8a33fb714064ddbe38bff2213fcf6837
 Author: William Hubbs <w.d.hubbs@gmail.com>
@@ -1438,3 +1397,14 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
     init.d.misc/wpa_supplicant: find wireless interface for FreeBSD
     
     This fixes #101.
+
+commit 78146b0e14cb57dda8a3aed3d4f8d6b1db7a3c7e
+Author: Sven Wegener <swegener@gentoo.org>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    do_service: Initialize idx to 0
+    
+    If index is not explicitly specified for service_started_daemon, it will
+    look for daemons by random index.
+    
+    This fixes #100.

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.33
+VERSION=	0.32.1
 PKG=		${NAME}-${VERSION}

NEWS.md

@@ -3,15 +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.33
-
-This version removes the "service" binary which was just a copy of
-"rc-service" provided for compatibility.
-
-If you still need the "service" binary, as opposed to "rc-service", it is
-recommended that you use something like Debian's init-system-helpers.
-Otherwise, just use "rc-service" in place of "service".
-
 ## OpenRC 0.31
 
 This version adds support for Control Groups version 2, which is

conf.d/agetty

@@ -1,6 +1,3 @@
-# make agetty quiet
-#quiet="yes"
-
 # Set the baud rate of the terminal line
 #baud=""
 

guide.md

@@ -53,6 +53,9 @@ Calling `openrc` without any arguments will try to reset all services so
 that the current runlevel is satisfied; if you manually started apache it will be 
 stopped, and if squid died but is in the current runlevel it'll be restarted.
 
+There is a `service` helper that emulates the syntax seen on e.g. older Redhat
+and Ubuntu (`service nginx start` etc.)
+
 # Runlevels
 
 OpenRC has a concept of runlevels, similar to what sysvinit historically 

init.d/agetty.in

@@ -16,7 +16,6 @@ term_type="${term_type:-linux}"
 command=/sbin/agetty
 command_args_foreground="${agetty_options} ${port} ${baud} ${term_type}"
 pidfile="/run/${RC_SVCNAME}.pid"
-export EINFO_QUIET="${quiet:-yes}"
 
 depend() {
 	after local

init.d/sysfs.in

@@ -118,7 +118,7 @@ cgroup1_base()
 	fi
 
 	if ! mountinfo -q /sys/fs/cgroup/openrc; then
-		local agent="${RC_LIBEXECDIR}/sh/cgroup-release-agent.sh"
+		local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
 		mkdir /sys/fs/cgroup/openrc
 		mount -n -t cgroup \
 			-o none,${sysfs_opts},name=openrc,release_agent="$agent" \

man/Makefile

@@ -6,7 +6,7 @@ MAN3=		einfo.3 \
 		rc_config.3 rc_deptree.3 rc_find_pids.3 rc_plugin_hook.3 \
 		rc_runlevel.3 rc_service.3 rc_stringlist.3
 MAN8=		rc-service.8 rc-status.8 rc-update.8 openrc.8 openrc-run.8 \
-		start-stop-daemon.8 supervise-daemon.8
+		service.8 start-stop-daemon.8 supervise-daemon.8
 
 ifeq (${OS},Linux)
 MAN8 += rc-sstat.8 openrc-init.8 openrc-shutdown.8

man/service.8

@@ -0,0 +1 @@
+.so rc-service.8

src/rc/Makefile

@@ -24,7 +24,7 @@ SBINDIR=	${PREFIX}/sbin
 LINKDIR=	${LIBEXECDIR}
 
 BINPROGS=	rc-status
-SBINPROGS = openrc openrc-run rc rc-service rc-update runscript \
+SBINPROGS = openrc openrc-run rc rc-service rc-update runscript service \
 			start-stop-daemon supervise-daemon
 RC_BINPROGS=	einfon einfo ewarnn ewarn eerrorn eerror ebegin eend ewend \
 				eindent eoutdent esyslog eval_ecolors ewaitfile \
@@ -150,7 +150,7 @@ rc-depend: rc-depend.o _usage.o rc-misc.o
 rc-status: rc-status.o _usage.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
-rc-service: rc-service.o _usage.o rc-misc.o
+rc-service service: rc-service.o _usage.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
 rc-update: rc-update.o _usage.o rc-misc.o