update ChangeLog

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

ChangeLog

@@ -1,3 +1,113 @@
+commit a94de51c4e55c1cb281a97e7d05f59dba831e6d2
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    consolefont: add after modules to dependencies
+    
+    X-Gentoo-Bug: 559540
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=559540
+
+commit ffbcabbbb4f04c164948d55daa409423d4f26b33
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Bump version to 0.18.4
+
+commit bc6ab0f8f3bbce0727e164e2f6c54d3be50eb175
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update changelog
+
+commit 248a7dcda351ef4172c28cc686bfe7b93fa522ff
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    mtab: typo fix
+
+commit bb451fd7b4a200b63ba355ef2ea5ba35444f49e7
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update ChangeLog
+
+commit fb23cbe204b9adeb817e2f5be7a1bb827bb9a477
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    mtab: make /etc/mtab as a file configurable
+
+commit a4346bb7f5fc09e81a61032ebc05f70692a4a04c
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    start work on 0.18.3
+
+commit 776346e2cd4a43ffeaf268b8a89927d9f3f9eca5
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update changelog
+
+commit ce71ffbfbe5e44bb61a3f00faf8466071dab5ea7
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    openrc-run.sh: fix new required_* tests to exit properly
+
+commit d9ee8ca5842983b59cc2c6e595d21e9a26a4f000
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update changelog
+
+commit 4e44e2cd73fb7fe08fb229bc3192d14f97dc2aa2
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    typo fix
+    
+    X-Gentoo-Bug: 563010
+    X-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=563010
+
+commit 88b807f9bcea5ec5bf5c5edb3c7161bf5c12d2d0
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    increment version number
+
+commit feba5d86b73b0df5587b178e80e85129a60861cd
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    mountinfo: make sure the netdev variable is initialized on Linux
+    
+    This fixes the following regression:
+    
+    X-Gentoo-Bug: 562668
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=562668
+
+commit 3b1e96a6a3af3de68a18558f3a6ebac31430a1cd
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    openrc-run.sh: allow spaces in required_{files,dirs}
+    
+    X-Gentoo-Bug: 562320
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=562320
+
+commit 79998bdf9cb5089f423e00bfa4bc3816b64c58d4
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    increment version number
+
+commit 050ddfae4ad1ad0dc5993766e0bd90739bd41de9
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
 commit d5116cc697c9eb275ab8497939ab41504e5ce578
 Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
@@ -997,237 +1107,3 @@ Commit: William Hubbs <w.d.hubbs@gmail.com>
     
     This is a more descriptive name since this file only sets the gitver
     variable.
-
-commit 30cc3cdb76a66c7c0f89a52db4e5cff77b570e31
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Make sysfs behave like netmount and localmount
-    
-    sysfs now mounts all related sysfs file systems and returns success,
-    like netmount and localmount.
-    
-    Also, we now check to make sure the cgroups are not mounted before we
-    mount them.
-    
-    X-Gentoo-Bug: 530138
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=530138
-
-commit dff6e4a004afeaa64f4ccb07c7d31bb821b043b4
-Author: S. Gilles <sgilles@umd.edu>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Fix mdoc warning for empty line in rc-update man page.
-    
-    X-Gentoo-Bug: 529374
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=529374
-
-commit 3fad31a994f7eb14f3f001f3980eb2b0ae8fe4f1
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    init.d: add osclock to ignore patterns
-
-commit 8d0ca13fbd38e782bae655eca6646dabc8d63899
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    devfs: optionally add missing symbolic links
-    
-    If symbolic links for /dev/{fd,stdin,stdout,stderr,core} do not exist
-    once /dev is mounted, we should create them.
-
-commit 93ba67eff9333e434c969bb8131467f777546764
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    netmount: unmount nfs file systems
-
-commit 1932360adca3f9fe9b47bcfad7b8bd5efbd33bee
-Author: Jason Zaman <jason@perfinion.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Integrate the functionality from runscript_selinux.so
-    
-    runscript used to dlopen() runscript_selinux.so. This adds equivalent
-    functionality directly in to runscript instead. It authenticates with
-    either PAM or shadow and optionally has a dep on audit.
-    
-    X-Gentoo-Bug: 517450
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=517450
-
-commit be952bebb3647069fb93b9791ee3439698f697ca
-Author: Alexander Vershilov <alexander.vershilov@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Fix incorrect handling of chroot option.
-    Fixes #28.
-    
-    X-Gentoo-Bug: #527370
-    X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=527370
-
-commit 0bfde472d0154f14ea88c0f5ddd21a510443d713
-Author: Ralph Sennhauser <sera@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Add osclock service
-    
-    This scripts sole purpose is to "provide clock" on OSs that already
-    take care of the clock being properly set.
-
-commit ba0a11fc94d303e208dd364b06c1c2a75bcdd62b
-Author: Johan Bergström <bugs@bergstroem.nu>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Pass ncurses cflags to build
-    
-    Fixes #25
-    Note from William Hubbs:
-    The original patch overwrote CFLAGS. I modified this patch to add the
-    ncurses cflags to CPPFLAGS instead of overwriting CFLAGS.
-
-commit 7700e6fe796cabfa22eefddc024d66257a28d4dc
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Fix compile errors created by bundling queue.h
-
-commit 6ca79042b9aa9752e577346e6f355356ef8f2f9a
-Author: Anthony G. Basile <blueness@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    helpers.h, start-stop-daemon.c: remove uneeded macros
-    
-    TAILQ_CONCAT, TAILQ_FOREACH_SAFE and LIST_FOREACH_SAFE are defined
-    in our bundled queue.h and are no longer required.
-
-commit 1e0a4bebdefd06af09ba8f2459287d3ca28f89d7
-Author: Anthony G. Basile <blueness@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Bundle <sys/queue.h> from NetBSD
-    
-    We are bundling this to allow building on musl-based systems since musl
-    does not include <sys/queue.h>.
-
-commit ca6b86be44fc7ed618a7ab3bd021e208d38878b1
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Fix all tests for GNU/kFreeBSD
-    
-    It is necessary to check for both the kernel and c library because
-    __FreeBSD_kernel is also defined on native FreeBSD [1].
-    
-    [1] http://sourceforge.net/p/predef/wiki/OperatingSystems/
-
-commit 4ac289b5397a688393c596a9a01651c94d3b5711
-Author: Gabriele Giacone <1o5g4r8o@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Fix rc_svcdir for GNU/Hurd
-
-commit 875f03e27c3475675f7b9572b071dd8c26257be7
-Author: Svante Signell <svante.signell@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    fix defines for GNU/Hurd
-
-commit 203b754f843fe6af0a40e983d557a9cdbc89f84b
-Author: Svante Signell <svante.signell@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    add missing files for GNU/Hurd
-
-commit 89c8a62a1078e770e12c47f06c8dbc9c2924e771
-Author: Gabriele Giacone <1o5g4r8o@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Fix rc_svcdir for GNU/kFreeBSD
-
-commit d8e1d9a6edf94ecac580e80e1113f4fdbdc5a23b
-Author: Gabriele Giacone <1o5g4r8o@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Add missing files for GNU/kFreeBSD
-
-commit 3f82edbeb9251149c6aff071d6537379af4e5eea
-Author: Svante Signell <svante.signell@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Fix GNU/kFreeBSD port
-    
-    Check for __FreeBSD_kernel instead of __GLIBC__ in source files.
-    
-    note from William Hubbs:
-    I was told this is a better check for GNU/kFreeBSD than checking the
-    C  library the source is being compiled against.
-    GNU/kFreeBSD than checking which library we are using.
-
-commit 86e9aa0d36813e2630c6613cd71c3ce8db642f71
-Author: Anthony G. Basile <blueness@gentoo.org>
-Commit: Anthony G. Basile <blueness@gentoo.org>
-
-    einfo.h, rc.h.in: simplify __BEGIN_DECLS logic
-    
-    There is no need to redefine __BEGIN_DECLS and __END_DECLS.
-    We simplify the logic here and avoid undefining these macros.
-
-commit 4a08517cac3c68c232694db7288654b58b68b8ba
-Author: Anthony G. Basile <blueness@gentoo.org>
-Commit: Anthony G. Basile <blueness@gentoo.org>
-
-    einfo.h, rc.h.in: ensure __BEGIN_DECLS is defined
-    
-    Some Standard C Libraries, like musl, don't define __BEGIN_DECLS
-    or __END_DECLS.  We add some ifdef magic to ensure these are
-    available.
-
-commit 9bf789f78890c8b5879d29acb9fb0e23285baee4
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Update news file wrt chroot variable
-
-commit f9acd65497c6e561fbf5420386a99d681fede859
-Author: Alexander Vershilov <alexander.vershilov@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    librc:look for the pid file in a chroot if defined
-    
-    X-Gentoo-Bug: 524388
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=524388
-
-commit 8c7ea4e9e8da500877a514402bbe90aababda2d6
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    runscript.sh: add chroot support
-    
-    This adds support for a chroot variable which will be passed to the
-    start-stop-daemon --chroot switch to runscript.sh when starting a
-    daemon. This also needs to be saved so it can be used in locating the
-    pid file when stopping the daemon.
-    
-    X-Gentoo-Bug: 524388
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=524388
-
-commit 5f1439f1aac14618592789042e05daaf80f55a15
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Add NEWS file
-
-commit 85da4a5e2621dc5f5356d440735aa058008a1b7e
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    add back nfs and nfs4 file systems
-    
-    Fix gentoo bug #427996 correctly.
-    We should attempt to mount the file systems, but not try to start the
-    daemons. The previous fix removed mounting the file systems as well as
-    starting the daemons.
-    
-    X-Gentoo-Bug: 508574
-    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=508574

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.18
+VERSION=	0.18.4
 PKG=		${NAME}-${VERSION}

NEWS.md

@@ -3,6 +3,29 @@
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
+## OpenRC-0.18.3
+
+Modern Linux systems expect /etc/mtab to be a symbolic link to
+/proc/self/mounts. Reasons for this change include support for mount
+namespaces, which will not work if /etc/mtab is a file.
+By default, the mtab service enforces this on each reboot.
+
+If you find that this breaks your system in some way, please do the
+following:
+
+- Set mtab_is_file=yes in /etc/conf.d/mtab.
+
+- Restart mtab. This will recreate the /etc/mtab file.
+
+- Check for an issue on https://github.com/openrc/openrc/issues
+  explaining why you need /etc/mtab to be a file. If there isn't one,
+  please open one and explain in detail why you need this to be a file.
+  If there is one, please add your comments to it. Please give concrete
+  examples of why  it is important that /etc/mtab be a file instead of a
+  symbolic link. Those comments will be taken into consideration for how
+  long to keep supporting mtab as a file or when the support can be
+  removed.
+
 ## OpenRC-0.18
 
 The behaviour of localmount and netmount in this version is changing. In

conf.d/Makefile

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

conf.d/mtab

@@ -0,0 +1,5 @@
+# This setting controls whether /etc/mtab is a file or symbolic link.
+# Most of the time, you shouldn't touch this. However, if the default
+# breaks your system in some way, please see the NEWS.md file that comes
+# with OpenRC for the actions to take.
+# mtab_is_file=no

init.d/consolefont.in

@@ -7,7 +7,7 @@ description="Sets a font for the consoles."
 depend()
 {
 	need localmount termencoding
-	after hotplug bootmisc
+	after hotplug bootmisc modules
 	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
 }
 

init.d/mtab.in

@@ -14,16 +14,17 @@ start()
 {
 	local rc=0
 	ebegin "Updating /etc/mtab"
-	if [ -L /etc/mtab ] ; then
+	if ! checkpath -W /etc; then
-		ewarn "/etc/mtab is a symlink, not updating."
-		ewarn "FYI - You can safely remove mtab from your runlevels."
-	elif ! checkpath -W /etc; then
 		rc=1
-	elif [ ! -e /etc/mtab ]; then
+	elif ! yesno ${mtab_is_file:-no}; then
-		einfo "Creating mtab symlink"
+		[ ! -L /etc/mtab ] && [ -f /etc/mtab ] &&
+			ewarn "Removing /etc/mtab file"
+		einfo "Creating mtab symbolic link"
 		ln -snf /proc/self/mounts /etc/mtab
 	else
-		einfo "Updating mtab file"
+		[ -L /etc/mtab ] && ewarn "Removing /etc/mtab symbolic link"
+		rm -f /etc/mtab
+		einfo "Creating mtab file"
 		# With / as tmpfs we cannot umount -at tmpfs in localmount as that
 		# makes / readonly and dismounts all tmpfs even if in use which is
 		# not good. Luckily, umount uses /etc/mtab instead of /proc/mounts

sh/openrc-run.sh.in

@@ -221,20 +221,22 @@ done
 # Load our script
 sourcex "$RC_SERVICE"
 
-for _d in $required_dirs; do
+eval "printf '%s\n' $required_dirs" | while read _d; do
-	if [ ! -d $_d ]; then
+	if [ -n "$_d" ] && [ ! -d "$_d" ]; then
 		eerror "$RC_SVCNAME: \`$_d' is not a directory"
 		exit 1
 	fi
 done
+[ $? -ne 0 ] && exit 1
 unset _d
 
-for _f in $required_files; do
+eval "printf '%s\n' $required_files" | while read _f; do
-	if [ ! -r $_f ]; then
+	if [ -n "$_f" ] && [ ! -r "$_f" ]; then
 		eerror "$RC_SVCNAME: \`$_f' is not readable"
 		exit 1
 	fi
 done
+[ $? -ne 0 ] && exit 1
 unset _f
 
 if [ -n "$opts" ]; then

src/rc/mountinfo.c

@@ -305,6 +305,7 @@ find_mounts(struct args *args)
 
 	buffer = xmalloc(sizeof(char) * PATH_MAX * 3);
 	while (fgets(buffer, PATH_MAX * 3, fp)) {
+		netdev = -1;
 		p = buffer;
 		from = strsep(&p, " ");
 		to = strsep(&p, " ");