release openrc-0.11.2

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.11
+VERSION=	0.11.2
 PKG=		${NAME}-${VERSION}

init.d/devfs.in

@@ -5,8 +5,8 @@
 description="Mount system critical filesystems in /dev."
 
 depend() {
-	use dev-mount udev-mount
+	use dev-mount
-	before udev mdev
+	before dev
 	keyword -prefix -vserver
 }
 

init.d/tmpfilesd.boot.in

@@ -11,7 +11,7 @@ depend()
 
 start()
 {
-	ebegin "${description/Create/Creating}"
+	ebegin "Creating ${description#Create }"
 	@LIBEXECDIR@/sh/tmpfiles.sh --create ${tmpfiles_opts}
 	eend $?
 	return 0

init.d/tmpfilesd.sysinit.in

@@ -8,12 +8,12 @@ depend()
 {
 	# Convert to 'need dev' when the new udev is ready, for OpenRC 0.11
 	#need dev-mount
-	need dev
+	use dev
 }
 
 start()
 {
-	ebegin "${description/Create/Creating}"
+	ebegin "Creating ${description#Create }"
 	@LIBEXECDIR@/sh/tmpfiles.sh --create ${tmpfiles_opts}
 	eend $?
 	return 0

man/rc-status.8

@@ -46,7 +46,7 @@ Show all runlevels and their services.
 List all services that have crashed.
 .It Fl l , -list
 List all defined runlevels.
-.It fl r , -runlevel
+.It Fl r , -runlevel
 Print the current runlevel name.
 .It Fl s , -servicelist
 Show all services.

sh/tmpfiles.sh.in

@@ -61,7 +61,7 @@ _f() {
 
 	if [ ! -e "$path" ]; then
 		dryrun_or_real install -m"$mode" -o"$uid" -g"$gid" /dev/null "$path"
-		[ -n "$arg" ] && _w "$@"
+		[ -z "$arg" ] || _w "$@"
 	fi
 }
 
@@ -72,7 +72,7 @@ _F() {
 	[ $CREATE -gt 0 ] || return 0
 
 	dryrun_or_real install -m"$mode" -o"$uid" -g"$gid" /dev/null "$path"
-	[ -n "$arg" ] && _w "$@"
+	[ -z "$arg" ] || _w "$@"
 }
 
 _d() {
@@ -201,6 +201,7 @@ tmpfiles_d=''
 # `/run/tmpfiles/foo.conf' will always be read after `/etc/tmpfiles.d/bar.conf'
 for d in ${tmpfiles_dirs} ; do
 	[ -d $d ] && for f in ${d}/*.conf ; do
+		[ "$f" = "$d/systemd.conf" ] && continue
 		[ -f $f ] && tmpfiles_basenames="${tmpfiles_basenames}\n${f##*/}"
 	done # for f in ${d}
 done # for d in ${tmpfiles_dirs}
@@ -252,46 +253,34 @@ for FILE in $tmpfiles_d ; do
 
 	# XXX: Upstream says whitespace is NOT permitted in the Path argument.
 	# But IS allowed when globs are expanded for the x/r/R/z/Z types.
-	while read line; do
+	while read cmd path mode uid gid age arg; do
 		LINENUM=$(( LINENUM+1 ))
 
-		# This will skip over comments and empty lines
-		set -- $line
-
 		# Unless we have both command and path, skip this line.
-		if [ -z "$1" -o -z "$2" ]; then
+		if [ -z "$cmd" -o -z "$path" ]; then
 			continue
 		fi
 
 		# whine about invalid entries
-		case $1 in
+		case $cmd in
 			f|F|w|d|D|p|L|c|b|x|r|R|z|Z) ;;
 			\#) continue ;;
 			*) warninvalid ; continue ;;
 		esac
 
-		cmd=$1
-		path=$2
-
 		# fall back on defaults when parameters are passed as '-'
-		if [ "$3" = '-' -o "$3" = '' ]; then
+		if [ "$mode" = '-' -o "$mode" = '' ]; then
-			case ${1} in
+			case "$cmd" in
 				p|f|F) mode=0644 ;;
 				d|D) mode=0755 ;;
 				z|Z|x|r|R|L) ;;
 			esac
-		else
-			mode=$3
 		fi
-		uid=$4
-		gid=$5
-		age=$6
-		arg=$7
 
-		[ "${4}" = '-' -o "${4}" = '' ] && uid=0
+		[ "$uid" = '-' -o "$uid" = '' ] && uid=0
-		[ "${5}" = '-' -o "${5}" = '' ] && gid=0
+		[ "$gid" = '-' -o "$gid" = '' ] && gid=0
-		[ "${6}" = '-' -o "${6}" = '' ] && age=0
+		[ "$age" = '-' -o "$age" = '' ] && age=0
-		[ "${7}" = '-' -o "${7}" = '' ] && arg=''
+		[ "$arg" = '-' -o "$arg" = '' ] && arg=''
 		set -- "$path" "$mode" "$uid" "$gid" "$age" "$arg"
 
 		[ "$VERBOSE" -eq "1" ] && echo _$cmd "$@"