X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmanager.c;h=f2f473b9f2f0338634d90e60b86f4276ba6a0700;hb=1302759d1581a4df0259cd4499a0908dad5f8b77;hp=86de0e3fbfad4eb003254392d89ce8962a2b9630;hpb=718db96199eb307751264e4163555662c9a389fa;p=elogind.git

diff --git a/src/core/manager.c b/src/core/manager.c
index 86de0e3fb..f2f473b9f 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -397,6 +397,8 @@ static int manager_default_environment(Manager *m) {
         if (!m->environment)
                 return -ENOMEM;
 
+        strv_sort(m->environment);
+
         return 0;
 }
 
@@ -1806,6 +1808,9 @@ void manager_send_unit_plymouth(Manager *m, Unit *u) {
         if (m->running_as != SYSTEMD_SYSTEM)
                 return;
 
+        if (detect_container(NULL) > 0)
+                return;
+
         if (u->type != UNIT_SERVICE &&
             u->type != UNIT_MOUNT &&
             u->type != UNIT_SWAP)
@@ -2504,7 +2509,7 @@ int manager_environment_add(Manager *m, char **minus, char **plus) {
         if (b != l)
                 strv_free(b);
 
-        m->environment = l;
+        m->environment = strv_sort(l);
         return 0;
 }