[gentoo-commits] proj/openrc:0.20.x commit in: src/rc/

[gentoo-commits] proj/openrc:0.20.x commit in: src/rc/

[William Hubbs]

commit:     506f2887e13eb8093bbff0915381644c4c08fc5c
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Jan 14 16:53:03 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 17:47:23 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=506f2887

fix selinux build

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

 src/rc/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/rc/Makefile b/src/rc/Makefile
index da1e5ee..ed0733e 100644
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -105,12 +105,12 @@ mountinfo: mountinfo.o _usage.o rc-misc.o
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
 openrc rc: rc.o rc-logger.o rc-misc.o rc-plugin.o _usage.o
-ifeq (${MKSELINUX},yes)
-openrc rc: rc-selinux.o
-endif
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
 openrc-run runscript: openrc-run.o _usage.o rc-misc.o rc-plugin.o
+ifeq (${MKSELINUX},yes)
+openrc-run runscript: rc-selinux.o
+endif
 	${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LDADD}
 
 rc-abort: rc-abort.o

[gentoo-commits] proj/openrc:0.20.x commit in: src/rc/

[William Hubbs]

commit:     fb37e1aa96df351b1bf591dc36ef332f86820a2b
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Jan 14 19:33:05 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 19:35:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=fb37e1aa

src/rc/Makefile: fix make depend target

 src/rc/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/rc/Makefile b/src/rc/Makefile
index ed0733e..a940102 100644
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -1,4 +1,9 @@
-SRCS=	rc.c 	rc-logger.c rc-misc.c rc-plugin.c
+SRCS=	checkpath.c do_e.c do_mark_service.c do_service.c \
+		do_value.c fstabinfo.c is_newer_than.c is_older_than.c \
+		mountinfo.c openrc-run.c rc-abort.c rc.c \
+		rc-depend.c rc-logger.c rc-misc.c rc-plugin.c \
+		rc-selinux.c rc-service.c rc-status.c rc-update.c \
+		shell_var.c start-stop-daemon.c swclock.c _usage.c
 
 ifeq (${MKSELINUX},yes)
 SRCS+=		rc-selinux.c

[gentoo-commits] proj/openrc:0.20.x commit in: src/rc/

[William Hubbs]

commit:     8e16828bd3d97e6b1e40ded616a54cb8a9e7b403
Author:     Doug Freed <dwfreed <AT> mtu <DOT> edu>
AuthorDate: Mon Jan 18 06:57:26 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 16:54:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=8e16828b

rc: remove use of magic constant and allow OpenVZ to drop to shell

OpenVZ has had console support for a long time now; allow them to use it
to drop to a shell during interactive boot.

 src/rc/rc.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/rc/rc.c b/src/rc/rc.c
index 1aae45f..7836341 100644
--- a/src/rc/rc.c
+++ b/src/rc/rc.c
@@ -283,9 +283,8 @@ open_shell(void)
 #ifdef __linux__
 	const char *sys = rc_sys();
 	
-	/* VSERVER and OPENVZ systems cannot really drop to shells */
-	if (sys &&
-	    (strcmp(sys, "VSERVER") == 0 || strcmp(sys, "OPENVZ") == 0))
+	/* VSERVER systems cannot really drop to shells */
+	if (sys && strcmp(sys, RC_SYS_VSERVER) == 0)
 	{
 		execl("/sbin/halt", "/sbin/halt", "-f", (char *) NULL);
 		eerrorx("%s: unable to exec `/sbin/halt': %s",

[gentoo-commits] proj/openrc:0.20.x commit in: src/rc/

[William Hubbs]

commit:     fa6707e5b33738c3416bfbad661770302aa50212
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Jan 16 21:34:17 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 04:53:58 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=fa6707e5

fix bsd build

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

 src/rc/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rc/Makefile b/src/rc/Makefile
index a940102..71ae503 100644
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -2,7 +2,7 @@ SRCS=	checkpath.c do_e.c do_mark_service.c do_service.c \
 		do_value.c fstabinfo.c is_newer_than.c is_older_than.c \
 		mountinfo.c openrc-run.c rc-abort.c rc.c \
 		rc-depend.c rc-logger.c rc-misc.c rc-plugin.c \
-		rc-selinux.c rc-service.c rc-status.c rc-update.c \
+		rc-service.c rc-status.c rc-update.c \
 		shell_var.c start-stop-daemon.c swclock.c _usage.c
 
 ifeq (${MKSELINUX},yes)

[gentoo-commits] proj/openrc:0.20.x commit in: src/rc/

[William Hubbs]

commit:     505af695d8bebdf468ada0899931554b31b4d22c
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Jan 20 17:19:01 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 22:45:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=505af695

openrc-run: in verbose mode, log execution of the shell script

This is to show when openrc-run runs the openrc-run.sh script; it is
used for debugging.

 src/rc/openrc-run.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/rc/openrc-run.c b/src/rc/openrc-run.c
index 757412a..2a4b90d 100644
--- a/src/rc/openrc-run.c
+++ b/src/rc/openrc-run.c
@@ -390,6 +390,14 @@ svc_exec(const char *arg1, const char *arg2)
 		}
 
 		if (exists(RC_SVCDIR "/openrc-run.sh")) {
+			if (arg2)
+				einfov("Executing: %s %s %s %s %s",
+					RC_SVCDIR "/openrc-run.sh", RC_SVCDIR "/openrc-run.sh",
+					service, arg1, arg2);
+			else
+				einfov("Executing: %s %s %s %s",
+					RC_SVCDIR "/openrc-run.sh", RC_SVCDIR "/openrc-run.sh",
+					service, arg1);
 			execl(RC_SVCDIR "/openrc-run.sh",
 			    RC_SVCDIR "/openrc-run.sh",
 			    service, arg1, arg2, (char *) NULL);
@@ -397,6 +405,16 @@ svc_exec(const char *arg1, const char *arg2)
 			    service, strerror(errno));
 			_exit(EXIT_FAILURE);
 		} else {
+			if (arg2)
+				einfov("Executing: %s %s %s %s %s",
+					RC_LIBEXECDIR "/sh/openrc-run.sh",
+					RC_LIBEXECDIR "/sh/openrc-run.sh",
+			    	service, arg1, arg2);
+			else
+				einfov("Executing: %s %s %s %s",
+					RC_LIBEXECDIR "/sh/openrc-run.sh",
+					RC_LIBEXECDIR "/sh/openrc-run.sh",
+			    	service, arg1);
 			execl(RC_LIBEXECDIR "/sh/openrc-run.sh",
 			    RC_LIBEXECDIR "/sh/openrc-run.sh",
 			    service, arg1, arg2, (char *) NULL);

[gentoo-commits] proj/openrc:0.20.x commit in: src/rc/

[William Hubbs]

commit:     f93396793a384afd6d8b82744fa260dd954e0f51
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Jan 22 18:46:29 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 18:54:42 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=f9339679

add back deprecation warnings lost during refactoring

 src/rc/openrc-run.c | 4 ++++
 src/rc/rc.c         | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/rc/openrc-run.c b/src/rc/openrc-run.c
index 2a4b90d..5e3ba67 100644
--- a/src/rc/openrc-run.c
+++ b/src/rc/openrc-run.c
@@ -1121,6 +1121,10 @@ int main(int argc, char **argv)
 		exit(EXIT_FAILURE);
 	}
 
+	applet = basename_c(argv[0]);
+	if (strcmp(applet, "runscript") == 0)
+		ewarnv("runscript is deprecated, please use openrc-run instead.");
+
 	if (stat(argv[1], &stbuf) != 0) {
 		fprintf(stderr, "openrc-run `%s': %s\n",
 		    argv[1], strerror(errno));

diff --git a/src/rc/rc.c b/src/rc/rc.c
index 4efa0cf..11170b4 100644
--- a/src/rc/rc.c
+++ b/src/rc/rc.c
@@ -830,6 +830,8 @@ int main(int argc, char **argv)
 		}
 	}
 
+	if (strcmp(applet, "rc") == 0)
+		ewarnv("rc is deprecated, please use openrc instead.");
 	newlevel = argv[optind++];
 	/* To make life easier, we only have the shutdown runlevel as
 	 * nothing really needs to know that we're rebooting.

[gentoo-commits] proj/openrc:0.20.x commit in: src/rc/

[William Hubbs]

commit:     670861da88322722860eae26b3fb786928295704
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Feb 12 18:40:55 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 14:37:44 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=670861da

Fix rc_env_allow wildcard usage

Before this commit, using * in rc_env_allow did not work.

This fixes #60.

 src/rc/rc-misc.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/rc/rc-misc.c b/src/rc/rc-misc.c
index f2967dd..82f1b78 100644
--- a/src/rc/rc-misc.c
+++ b/src/rc/rc-misc.c
@@ -68,6 +68,12 @@ env_filter(void)
 
 	/* Add the user defined list of vars */
 	env_allow = rc_stringlist_split(rc_conf_value("rc_env_allow"), " ");
+	/*
+	 * If '*' is an entry in rc_env_allow, do nothing as we are to pass
+	 * through all environment variables.
+	 */
+	if (rc_stringlist_find(env_allow, "*"))
+		return;
 	profile = rc_config_load(RC_PROFILE_ENV);
 
 	/* Copy the env and work from this so we can manipulate it safely */