[gentoo-commits] proj/openrc:master commit in: sh/

[William Hubbs]

commit:     e90dcf39dd3f3658a7d9804e73d0442ae6c7935c
Author:     Dirk Sondermann <ds-gentoo <AT> dyximaq <DOT> de>
AuthorDate: Sat Jul 27 15:53:32 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 15:53:32 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=e90dcf39

tmpfiles: do not signal an error if device nodes already exist

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

---
 sh/tmpfiles.sh.in | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sh/tmpfiles.sh.in b/sh/tmpfiles.sh.in
index 22d5f1f..b59f4cb 100755
--- a/sh/tmpfiles.sh.in
+++ b/sh/tmpfiles.sh.in
@@ -54,17 +54,19 @@ relabel() {
 _b() {
 	# Create a block device node if it doesn't exist yet
 	local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
-	[ ! -e "$path" ] && \
-		dryrun_or_real mknod -m $mode $path b ${arg%:*} ${arg#*:} && \
+	if [ ! -e "$path" ]; then
+		dryrun_or_real mknod -m $mode $path b ${arg%:*} ${arg#*:}
 		dryrun_or_real chown $uid:$gid $path
+	fi
 }
 
 _c() {
 	# Create a character device node if it doesn't exist yet
 	local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
-	[ ! -e "$path" ] && \
-		dryrun_or_real mknod -m $mode $path c ${arg%:*} ${arg#*:} && \
+	if [ ! -e "$path" ]; then
+		dryrun_or_real mknod -m $mode $path c ${arg%:*} ${arg#*:}
 		dryrun_or_real chown $uid:$gid $path
+	fi
 }