Update ChangeLog

This is needed to allow the service script author to set a default for
rc_ulimit inside the service script.

ChangeLog

@@ -1,3 +1,215 @@
+commit 66ed8082d0c865a0b4f4cc436cf9e13351e3d6fe
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    sh/openrc-run: source service script before ulimit is processed
+    
+    This is needed to allow the service script author to set a default for
+    rc_ulimit inside the service script.
+
+commit c2d256bafb9d1dfafbfd0846c035c5d26f7449c8
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    man/openrc-run.8: document fstabinfo and mountinfo
+    
+    X-Gentoo-Bug: 592374
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=592374
+
+commit f48d9c33a5c708c871d6657a39485d1c0c735548
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    man/openrc-run.8: document _pre and _post functions
+    
+    Fixes https://github.com/openrc/openrc/issues/155.
+
+commit 6d4e8433974fd8567885635ae0454031290f96b1
+Author: Jason Graham <jgraha8@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix ENT macro usage
+    
+    X-Gentoo-Bug: 624796
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=624796
+
+commit 0513cd3964a9564e0ba39b50aa8ebd3d7e9a3920
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.29
+
+commit 72bb2e57de935ab46ad000f97a5720265bed9342
+Author: John R. Graham <john_r_graham@gentoo.org>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Typo fix
+    
+    X-Gentoo-Bug: 624908
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=624908
+
+commit 84c5da30695db89d686d3c28c7cacdf172cbf429
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit b35099cb707e333b6b8d30d956ffa93bcd2da0ab
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Add comment about overriding the default efivars mount in fstab to news
+
+commit 3fd3bfc76dccc3752f4af949ad4076dab26357fb
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    add link to efivars issue to news file
+
+commit 492a6303cb8314263bfd3631e3b0de5a9df178da
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
+commit e7807b3136d8993805082320784460f5059e6275
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix sysvinit compatibility for shutdown wrapper
+
+commit 03a461ac0ee34b7900868cdea624c6fd868b1656
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix sysvinit compatibility for reboot wrapper
+
+commit 7e0f76e0adc545c74a8332a6ef0811d2aa62cb81
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix sysvinit compatibility for poweroff wrapper
+
+commit 9812ce5b8dc22fe36cc7bf75cf6e62db204ece3d
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix halt wrapper so it is sysvinit compatible
+    
+    This makes the halt wrapper sysvinit compatible. It ignores several
+    command line switches which are not currently implemented; however,
+    those can be implemented if we need to do so.
+    
+    This fixes https://github.com/openrc/openrc/issues/146.
+
+commit 12f75e4167f84a9a85f69924ebdb28ad36c085cb
+Author: Adam Borowski <kilobyte@angband.pl>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    man: fix an unclosed .Bl/.El warning
+    
+    This fixes #151.
+
+commit 260368e0103e95625c29760f2c2ec89143e5a233
+Author: Adam Borowski <kilobyte@angband.pl>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    man: fix missing .Pp warnings
+    
+    This fixes #151.
+
+commit f87a9eec3d23ea01578500972f1df993d5d24fba
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/sysfs: mount efivars read only
+    
+    This fixes #134.
+
+commit 1e837d596e483ceb5cec177a6c7faff24a42384b
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix argument parsing for the sysvinit shutdown wrapper
+    
+    This fixes #140.
+
+commit dcc686e42b406d63d52ef75de9a326f67d0a06c9
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    scripts/shutdown: fix arguments to be sysvinit shutdown compatible
+    
+    This fixes #140.
+
+commit 2f81c100afdf45ebf787dfc5d3261aa6055640e4
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Fix link to shutdown for MKSYSVINIT=yes
+
+commit a511a48d77b1dcb8a3fb0dd1abddb750a152869b
+Author: Nuno Silva <nuno.m.ribeiro.silva@tecnico.ulisboa.pt>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/hostname: fix default parameter syntax
+    
+    The syntax for expanding a variable with a default value is
+            ${parameter:-word}
+    not
+            ${parameter-word}
+    although the latter still works for a reason I could not explain.
+    
+    This fixes #143.
+
+commit 1e5322e5c55ec744a2cdcc3342ef6547eab7c46f
+Author: Nuno Silva <nuno.m.ribeiro.silva@tecnico.ulisboa.pt>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/hostname: fix indentation
+    
+    This is for #143.
+
+commit 199a210d2fbc524c9c400a06f832dabffd7ed1b3
+Author: udeved <artoo@manjaro.org>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    scripts/Makefile: make symlinks absolute instead of relative
+    
+    This closes #142.
+
+commit 5b7667af32effddf867a5d021c66d43f0645d374
+Author: udeved <artoo@manjaro.org>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    scripts/Makefile: respect SBINDIR with MKSYSVINIT
+    
+    This is for #142.
+
+commit 11243f85b67e5f450ddf50346ffd4a1b2c6faeb5
+Author: Jory A. Pratt <anarchy@gentoo.org>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    kill_all: include limits.h for PATH_MAX
+
+commit 3c40826d3466cdda1a46abcd5c86b661b8185f46
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.28
+
+commit 560d874d2fee63bf7ca11f17cf9933021b639a1d
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fix compile issue for musl
+
+commit e84366fd232a41c3ba79ed351e93c74cef8d7c8d
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
 commit caacedc0a82285fb2d25c6d3473f154044c7ad66
 Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
@@ -1300,287 +1512,3 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
     
     X-Gentoo-Bug: 342313
     X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=342313
-
-commit 1a55d46645b376cd27f394796934150120a08387
-Author: Raymond Jennings <shentino@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    local.d/README: typo fix
-    
-    X-Gentoo-Bug: 591258
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=591258
-
-commit cae3976ef1276ce33aa7e49474f13499a48a3fe6
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d: Add runsvdir to ignore patterns
-
-commit da28a3d367b6078deda6bc205806b43b971e67a9
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d: initial service adjustments for docker support
-    
-    Add -docker keyword to the same scripts that have -lxc keyword.
-
-commit ca8c29ee60b0e8ca89091aaf801725bd71e28001
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    librc: fix Docker auto detection
-    
-    The original auto detection of Docker containers assumed the presence of
-    a container environment variable. However, Docker-1.12 does not
-    implement this, and I'm not sure which versions of docker implemented
-    it.
-    
-    The new test is for the presence of a file named .dockerenv in the
-    root directory.
-
-commit f62253b8334a85dac4671e42817b96a3bedd1881
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Add support for runit
-    
-    X-Gentoo-Bug: 501364
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=501364
-
-commit f2c2e2dd5a5e0a22da4dcabea6615d0f4697a962
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/sysctl.in: typo fix
-
-commit 94b98430cb83a8f4e62d837100fc357e9eb12ca6
-Author: Kenneth Lakin <kennethlakin@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    start-stop-daemon: Add SSD_IONICELEVEL
-    
-    This is the disk IO counterpart to SSD_NICELEVEL.
-    Modified by William Hubbs to add the variable to the start-stop-daemon
-    man page.
-    
-    This fixes #69.
-
-commit b19d0a40d7f20987323d5af91469c720ead39561
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d/loopback: remove unnecessary stop function
-
-commit 0c229faf7e6a57bcff70f2143b83cb69a34c89f4
-Author: Martin Väth <martin@mvath.de>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    tmpfiles.sh: Support lines with q Q h H
-    
-    btrfs support is not implemented yet (for q Q v), but at least tmpfiles.sh
-    no longer chokes about tmpfiles.d lines of recent systemd versions
-    
-    This fixes #87.
-
-commit 3092e310acd376fc626cc051549e02bcd7697aed
-Author: Mike Gilbert <floppym@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    tmpfiles: Accept filenames as command line arguments
-    
-    This brings us closer to being able to use tmpfiles.sh as a full
-    replacement for systemd-tmpfiles.
-    
-    This closes #83.
-
-commit 671911762d1bcd90c10d8ac0eb30fe10be4a65f6
-Author: Mike Gilbert <floppym@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    tmpfiles: Process command line before gathering config files
-    
-    This is part of #83.
-
-commit 7d68839e9ea89b0a92aef69a9b4fd298554bb9b1
-Author: Mike Gilbert <floppym@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    tmpfiles: Make unrecognized options fatal
-    
-    This is part of #83.
-
-commit 5341a925c15934674031aebb97533b0adcd10236
-Author: Jakub Jirutka <jakub@jirutka.cz>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    s6-guide: fix typo
-    
-    This fixes #92.
-
-commit 3adb8fb389caaafbed1be13c5ac4d96214c8eed3
-Author: Doug Freed <dwfreed@mtu.edu>
-Commit: Doug Freed <dwfreed@mtu.edu>
-
-    rc-logger: refuse to cat TMPLOG into itself
-    
-    This prevents an infinite loop in case somebody decides to set
-    rc_log_path to match TMPLOG.
-
-commit 8927a37fb790e718c956376242a532ab9d1755e7
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    etc: remove rc.conf.* file fragments
-
-commit b085b2cda58bc884acb959e48f14fb044c983042
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    etc: create default rc.conf
-    
-    Before now, /etc/rc.conf was created by the build system from multiple
-    rc.conf.* file fragments and there was no reason for this.
-
-commit daf93977641201f16c477b075ce9055a1da8f7b3
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d: combine sysctl scripts
-    
-    We had separate sysctl scripts for each operating system. However, there
-    is no need to do this since we can detect the operating system at
-    runtime with $RC_UNAME.
-
-commit 2984504c887afc9a36610eb7c20b097f7d1e70d0
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    conf.d: remove staticroute file fragments
-
-commit 35e8386c24df6483f2918979dae150421f7151df
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    conf.d: makestaticroute file static
-
-commit 2108285d64e2ee8cc03fbe544efc3752fe349bdd
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    conf.d: remove network file fragnents
-
-commit a3133fec250eca3cdfb460c2ce26c707fd593c09
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    conf.d: make network file static
-
-commit 314ae3dc781d7ae8fc26c276a85b0dc6ab6bc326
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    modules: add support for FreeBSD
-    
-    This is based on a patch submitted by
-    Joe Maloney <pkgdemonteam@gmail.com>.
-    
-    This fixes #91.
-
-commit 695be59083cdf0d2ff9296f2c210e591c51bdf40
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    rc-status: add -m/--manual  option to show manually started services
-    
-    X-Gentoo-Bug: 585906
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=585906
-
-commit c962678dd6ab1314b55c2a3bcdae03902bda39b8
-Author: Doug Freed <dwfreed@mtu.edu>
-Commit: Doug Freed <dwfreed@mtu.edu>
-
-    rc: Rename some static variables to kill warnings
-
-commit 3a1262703fd20d2e8288d13d908fb282c77d1793
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Remove the DEBUG_MEMORY macro
-    
-    This fixes #43.
-
-commit 20035210bdf5d5729734457f35f5f32a53a5b3ad
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    make variable aflag a boolean show_all
-
-commit 7f84b5d741c150cd159d5a3cda3ef532f0381826
-Author: Jaromil <jaromil@dyne.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    libeinfo: document the x suffix on function names
-    
-    This fixes #88.
-
-commit 8bca2cd4b3c710809131ac036456b34c223e8d12
-Author: Julian Ospald <hasufell@posteo.de>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Build: fix hardcoded pkg-config invocation
-    
-    This fixes #89.
-
-commit ac8ad169ae59fece38066c2e08ff57d53d737edd
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    hwclock: always use --noadjfile if available
-    
-    When we use the --utc or --localtime switch, also use --noadjfile if it
-    is available. This means hwclock will not use a drift file.
-    
-    X-Gentoo-Bug: 584722
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=584722
-
-commit 553799400218903ab495d1154a41c6d8890cb752
-Author: Mike Gilbert <floppym@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    man: Document the procname variable for openrc-run
-    
-    X-Gentoo-Bug: 586794
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/586794
-
-commit 5af5d12f3e56f9f2ff232d124d27c856fd66f551
-Author: Benda Xu <heroxbd@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Fix PATH for Prefix.
-    
-    1. remove default /bin:/sbin:/usr/bin:/usr/sbin
-    2. PKG_PREFIX should be defaulted to $(PREFIX)/usr
-    3. LOCAL_PREFIX should be defaulted to $(PREFIX)/usr/local
-    
-    X-Gentoo-Bug:583634
-    X-Gentoo-Bug-URL:https://bugs.gentoo.org/show_bug.cgi?id=583634
-
-commit b2c92b88cc6ce6d81444667efbc6d44542db1788
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    fstabinfo/mountinfo: ensure /etc/fstab exists before calling setmntent
-    
-    This is based on a patch by A. Wilcox <awilfox.gentoo@foxkit.us>.
-    
-    X-Gentoo-Bug: 478226
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=478226
-    
-    X-Gentoo-Bug: 478226
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=478226
-
-commit 1b32af17225a4b18ced7f4326727cbe8265e7fd2
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    increment version to 0.22

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.27
+VERSION=	0.29
 PKG=		${NAME}-${VERSION}

NEWS.md

@@ -3,6 +3,20 @@
 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

conf.d/localmount

@@ -3,7 +3,7 @@
 #no_umounts="/dir1:/var/dir2"
 #
 # Mark certain mount points as critical.
-# This contains aspace separated list of mount points which should be
+# This contains a space separated list of mount points which should be
 # considered critical. If one of these mount points cannot be mounted,
 # localmount will fail.
 # By default, this is empty.

init.d/hostname.in

@@ -11,7 +11,8 @@
 
 description="Sets the hostname of the machine."
 
-depend() {
+depend()
+{
 	after clock
 	keyword -docker -lxc -prefix -systemd-nspawn
 }
@@ -20,12 +21,12 @@ start()
 {
 	local h source x
 	if [ -s @SYSCONFDIR@/hostname ] && [ -r @SYSCONFDIR@/hostname ]; then
-	read h x <@SYSCONFDIR@/hostname
-	source=" from @SYSCONFDIR@/hostname"
+		read h x <@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
+		h=${hostname:-${HOSTNAME}} # checkbashisms: false positive (HOSTNAME var)
 	fi
 	if [ -z "$h" ]; then
 		einfo "Using default system hostname"

init.d/sysfs.in

@@ -101,7 +101,7 @@ mount_misc()
 	if [ -d /sys/firmware/efi/efivars ] &&
 		! mountinfo -q /sys/firmware/efi/efivars; then
 		ebegin "Mounting efivarfs filesystem"
-		mount -n -t efivarfs -o ${sysfs_opts} \
+		mount -n -t efivarfs -o ro \
 			efivarfs /sys/firmware/efi/efivars 2> /dev/null
 		eend 0
 	fi

man/openrc-run.8

@@ -284,6 +284,18 @@ system.
 To see how to influence dependencies in configuration files, see the
 .Sx FILES
 section below.
+.Sh _pre AND _post FUNCTIONS
+Any command defined in extra_commands, extra_started_commands or
+extra_stopped_commands can have _pre and _post functions in the service
+script. If the command function is called foo, the_pre and _post
+functions for it should be called foo_pre and foo_post.
+.Pp
+These functions should be used to perform preparation before the
+command is run and cleanup after the command completes. In order for
+.Nm
+to record the command as being run successfully, the _pre
+function, command function itself and the _post function should all exit
+with a zero return code.
 .Sh BUILTINS
 .Nm
 defines some builtin functions that you can use inside your service scripts:
@@ -412,27 +424,63 @@ 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.
+.Ic fstabinfo
+.Op Fl M , -mount
+.Op Fl R , -remount
+.Op Fl b , -blockdevice
+.Op Fl m , -mountargs
+.Op Fl o , -options
+.Op Fl p , -passno Ar passno
+.Op Fl t , -type Ar fstype
+.Ar path
+.Xc
+If -b, -m, -o, -p or -t is specified,the appropriate information is
+extracted from fstab. If -M or -R are given, file systems are mounted or
+remounted.
+.Pp
+The -q option suppresses all informational output. If it is specified
+twice, all error messages are suppressed as well.
+.Ic mountinfo
+.Op Fl f, -fstype-regex Ar regex
+.Op Fl F, -skip-fstype-regex Ar regex
+.Op Fl n, -node-regex Ar regex
+.Op Fl N, -skip-node-regex Ar regex
+.Op Fl o, -options-regex Ar regex
+.Op Fl O, -skip-options-regex Ar regex
+.Op Fl p, -point-regex Ar regex
+.Op Fl P, -skip-point-regex Ar regex
+.Op Fl e, -netdev
+.Op Fl E, -nonetdev
+.Op Fl i, -options
+.Op Fl s, -fstype
+.Op Fl t, -node
+  .Ar mount1 mount2 ...
+.Xc
+The f, F, n, N, o, O, p, P, e and E options specify what you want to
+search for or skip in the mounted file systems. The i, s and t options
+specify what you want to display. If no mount points are given, all
+mount points will be considered.
 .It Ic yesno Ar value
 If
 .Ar value

man/supervise-daemon.8

@@ -130,6 +130,7 @@ 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

scripts/Makefile

@@ -17,13 +17,13 @@ endif
 _installafter:
 ifeq (${OS},Linux)
 	${INSTALL} -d ${DESTDIR}${SBINDIR}
-	ln -sf ../${DIR}/rc-sstat ${DESTDIR}/${SBINDIR}/rc-sstat
+	ln -sf ${DIR}/rc-sstat ${DESTDIR}/${SBINDIR}/rc-sstat
 ifeq (${MKSYSVINIT},yes)
-	ln -sf	../${DIR}/halt ${DESTDIR}/sbin/halt
-	ln -sf	../${DIR}/poweroff ${DESTDIR}/sbin/poweroff
-	ln -sf	../${DIR}/reboot ${DESTDIR}/sbin/reboot
-	ln -sf	../${DIR}/shutdown ${DESTDIR}/sbin/shutdown
-	ln -sf	openrc-init ${DESTDIR}/sbin/init
+	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
 

scripts/halt.in

@@ -1,3 +1,24 @@
 #!@SHELL@
 
-exec @SBINDIR@/openrc-shutdown --halt "$@"
+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,3 +1,23 @@
 #!@SHELL@
 
-exec @SBINDIR@/openrc-shutdown --poweroff "$@"
+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,3 +1,25 @@
 #!@SHELL@
 
-exec @SBINDIR@/openrc-shutdown --reboot "$@"
+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,8 +1,29 @@
 #!@SHELL@
 
-args="$@"
-case "$@" in
-	*--single*|*-s*) args="$@" ;;
-	*) args="--single $@";;
-esac
-exec @SBINDIR@/openrc-shutdown "$args"
+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/openrc-run.sh.in

@@ -243,6 +243,9 @@ sourcex "@LIBEXECDIR@/sh/s6.sh"
 sourcex "@LIBEXECDIR@/sh/start-stop-daemon.sh"
 sourcex "@LIBEXECDIR@/sh/supervise-daemon.sh"
 
+# Load our script
+sourcex "$RC_SERVICE"
+
 # Set verbose mode
 if yesno "${rc_verbose:-$RC_VERBOSE}"; then
 	EINFO_VERBOSE=yes
@@ -272,9 +275,6 @@ for _cmd; do
 	fi
 done
 
-# Load our script
-sourcex "$RC_SERVICE"
-
 eval "printf '%s\n' $required_dirs" | while read _d; do
 	if [ -n "$_d" ] && [ ! -d "$_d" ]; then
 		eerror "$RC_SVCNAME: \`$_d' is not a directory"

src/rc/fstabinfo.c

@@ -35,11 +35,11 @@
 #  define GET_ENT getmntent (fp)
 #  define GET_ENT_FILE(_name) getmntfile (_name)
 #  define END_ENT endmntent (fp)
-#  define ENT_BLOCKDEVICE(_ent) ent->mnt_fsname
-#  define ENT_FILE(_ent) ent->mnt_dir
-#  define ENT_TYPE(_ent) ent->mnt_type
-#  define ENT_OPTS(_ent) ent->mnt_opts
-#  define ENT_PASS(_ent) ent->mnt_passno
+#  define ENT_BLOCKDEVICE(_ent) (_ent)->mnt_fsname
+#  define ENT_FILE(_ent) (_ent)->mnt_dir
+#  define ENT_TYPE(_ent) (_ent)->mnt_type
+#  define ENT_OPTS(_ent) (_ent)->mnt_opts
+#  define ENT_PASS(_ent) (_ent)->mnt_passno
 #else
 #  define HAVE_GETFSENT
 #  include <fstab.h>
@@ -48,11 +48,11 @@
 #  define GET_ENT getfsent ()
 #  define GET_ENT_FILE(_name) getfsfile (_name)
 #  define END_ENT endfsent ()
-#  define ENT_BLOCKDEVICE(_ent) ent->fs_spec
-#  define ENT_TYPE(_ent) ent->fs_vfstype
-#  define ENT_FILE(_ent) ent->fs_file
-#  define ENT_OPTS(_ent) ent->fs_mntops
-#  define ENT_PASS(_ent) ent->fs_passno
+#  define ENT_BLOCKDEVICE(_ent) (_ent)->fs_spec
+#  define ENT_TYPE(_ent) (_ent)->fs_vfstype
+#  define ENT_FILE(_ent) (_ent)->fs_file
+#  define ENT_OPTS(_ent) (_ent)->fs_mntops
+#  define ENT_PASS(_ent) (_ent)->fs_passno
 #endif
 
 #include "einfo.h"
@@ -114,24 +114,24 @@ do_mount(struct ENT *ent, bool remount)
 
 	argv[0] = UNCONST("mount");
 	argv[1] = UNCONST("-o");
-	argv[2] = ENT_OPTS(*ent);
+	argv[2] = ENT_OPTS(ent);
 	argv[3] = UNCONST("-t");
-	argv[4] = ENT_TYPE(*ent);
+	argv[4] = ENT_TYPE(ent);
 	if (!remount) {
-		argv[5] = ENT_BLOCKDEVICE(*ent);
-		argv[6] = ENT_FILE(*ent);
+		argv[5] = ENT_BLOCKDEVICE(ent);
+		argv[6] = ENT_FILE(ent);
 		argv[7] = NULL;
 	} else {
 #ifdef __linux__
 		argv[5] = UNCONST("-o");
 		argv[6] = UNCONST("remount");
-		argv[7] = ENT_BLOCKDEVICE(*ent);
-		argv[8] = ENT_FILE(*ent);
+		argv[7] = ENT_BLOCKDEVICE(ent);
+		argv[8] = ENT_FILE(ent);
 		argv[9] = NULL;
 #else
 		argv[5] = UNCONST("-u");
-		argv[6] = ENT_BLOCKDEVICE(*ent);
-		argv[7] = ENT_FILE(*ent);
+		argv[6] = ENT_BLOCKDEVICE(ent);
+		argv[7] = ENT_FILE(ent);
 		argv[8] = NULL;
 #endif
 	}

src/rc/kill_all.c

@@ -19,6 +19,7 @@
 #include <dirent.h>
 #include <errno.h>
 #include <getopt.h>
+#include <limits.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>

src/rc/rc-wtmp.c

@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/utsname.h>