update changelog

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

ChangeLog

@@ -1,3 +1,92 @@
+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>

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.18
+VERSION=	0.18.3
 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/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, " ");