[gentoo-commits] proj/openrc:openrc-0.10.x commit in: sh/

[gentoo-commits] proj/openrc:openrc-0.10.x commit in: sh/

[William Hubbs]

commit:     d5ecc9d7468403487361c7515133b1e1cb7c0ebf
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  2 18:22:04 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jul  2 18:47:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=d5ecc9d7

fix handling of /run for vserver

Mount can't be used in vservers, but /run is still needed. So we create
the directory and clear it out instead of mounting a tmpfs in that
situation.

reported-by: <patrick <AT> gentoo.org>
X-Gentoo-Bug: 423739
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=423739

---
 sh/init.sh.Linux.in |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in
index 5daa1bb..0eca736 100644
--- a/sh/init.sh.Linux.in
+++ b/sh/init.sh.Linux.in
@@ -37,14 +37,23 @@ fi
 
 # /run is a new directory for storing volatile runtime data.
 # Read more about /run at https://lwn.net/Articles/436012
+sys="$(rc --sys)"
+
 if [ ! -d /run ]; then
-	eerror "The /run directory does not exist. Unable to continue."
-	return 1
+	if [ "$sys" = VSERVER ]; then
+		if [ -e /run ]; then
+		rm -rf /run
+		fi
+		mkdir /run
+	else
+		eerror "The /run directory does not exist. Unable to continue."
+		return 1
+	fi
 fi
 
-if mountinfo -q /run; then
-	einfo "/run is already mounted, skipping"
-else
+if [ "$sys" = VSERVER ]; then
+	rm -rf /run/*
+elif ! mountinfo -q /run; then
 	ebegin "Mounting /run"
 	rc=0
 	if ! fstabinfo --mount /run; then

[gentoo-commits] proj/openrc:openrc-0.10.x commit in: sh/

[William Hubbs]

commit:     d036b4ad1af7547cf5c91f1313742b8c012d1e6d
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 16 18:44:47 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Sep  9 23:38:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=d036b4ad

sh/tmpfiles: fix quoting for optional arguments

Some optional arguments were missing quotes in the tests, so produced
spurious warnings.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 sh/tmpfiles.sh.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sh/tmpfiles.sh.in b/sh/tmpfiles.sh.in
index de81964..1460bdf 100755
--- a/sh/tmpfiles.sh.in
+++ b/sh/tmpfiles.sh.in
@@ -268,10 +268,10 @@ for FILE in $tmpfiles_d ; do
 		age=$6
 		arg=$7
 
-		[ ${4} = '-' ] && uid=0
-		[ ${5} = '-' ] && gid=0
-		[ ${6} = '-' ] && age=0
-		[ ${7} = '-' ] && arg=''
+		[ "${4}" = '-' -o "${4}" = '' ] && uid=0
+		[ "${5}" = '-' -o "${5}" = '' ] && gid=0
+		[ "${6}" = '-' -o "${6}" = '' ] && age=0
+		[ "${7}" = '-' -o "${7}" = '' ] && arg=''
 		set -- "$path" "$mode" "$uid" "$gid" "$age" "$arg"
 
 		[ "$VERBOSE" -eq "1" ] && echo _$cmd "$@"