openrc-run: import variabes from activation environment

Author: navi-desu

src/openrc-run/openrc-run.c

@@ -708,6 +708,7 @@ svc_start_deps(void)
 	/* We use tmplist to hold our scheduled by list */
 	tmplist = rc_stringlist_new();
 	TAILQ_FOREACH(svc, services, entries) {
+		rc_import_variables(svc->value);
 		state = rc_service_state(svc->value);
 		if (state & RC_SERVICE_STARTED)
 			continue;
@@ -833,6 +834,7 @@ static void svc_start_real(void)
 static void
 svc_start(void)
 {
+	rc_import_variables(NULL);
 	if (dry_run)
 		einfon("start:");
 	else
@@ -943,8 +945,10 @@ svc_stop_deps(RC_SERVICE state)
 		return;
 
 	TAILQ_FOREACH(svc, tmplist, entries) {
-		if (rc_service_state(svc->value) & RC_SERVICE_STOPPED)
+		rc_import_variables(svc->value);
+		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 +1019,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