openrc-run: import variabes from activation environment

Author: navi-desu

src/openrc-run/openrc-run.c

@@ -709,8 +709,11 @@ svc_start_deps(void)
 	tmplist = rc_stringlist_new();
 	TAILQ_FOREACH(svc, services, entries) {
 		state = rc_service_state(svc->value);
-		if (state & RC_SERVICE_STARTED)
+		if (state & RC_SERVICE_STARTED) {
+			if (!rc_import_variables(svc->value))
+				eerror("%s: failed to import variables from %s: %s", applet, svc->value, strerror(errno));
 			continue;
+		}
 
 		/* Don't wait for services which went inactive but are
 		 * now in starting state which we are after */
@@ -727,8 +730,11 @@ svc_start_deps(void)
 			eerror("%s: timed out waiting for %s",
 			    applet, svc->value);
 		state = rc_service_state(svc->value);
-		if (state & RC_SERVICE_STARTED)
+		if (state & RC_SERVICE_STARTED) {
+			if (!rc_import_variables(svc->value))
+				eerror("%s: failed to import variables from %s: %s", applet, svc->value, strerror(errno));
 			continue;
+		}
 		if (rc_stringlist_find(need_services, svc->value)) {
 			if (state & RC_SERVICE_INACTIVE ||
 			    state & RC_SERVICE_WASINACTIVE)
@@ -833,6 +839,8 @@ static void svc_start_real(void)
 static void
 svc_start(void)
 {
+	if (!rc_import_variables(NULL))
+		eerror("%s: failed to import variables: %s", applet, strerror(errno));
 	if (dry_run)
 		einfon("start:");
 	else
@@ -943,8 +951,9 @@ svc_stop_deps(RC_SERVICE state)
 		return;
 
 	TAILQ_FOREACH(svc, tmplist, entries) {
-		if (rc_service_state(svc->value) & RC_SERVICE_STOPPED)
+		if (rc_service_state(svc->value) & RC_SERVICE_STOPPED) {
 			continue;
+		}
 		svc_wait(svc->value);
 		if (rc_service_state(svc->value) & RC_SERVICE_STOPPED)
 			continue;
@@ -1015,9 +1024,10 @@ svc_stop_real(void)
 static int
 svc_stop(void)
 {
-	RC_SERVICE state;
+	RC_SERVICE state = 0;
+
+	rc_import_variables(NULL);
 
-	state = 0;
 	if (dry_run)
 		einfon("stop:");
 	else