resolved: apply label to /run/systemd/resolve/resolv.conf

[elogind.git] / src / resolve / resolved.c

diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
index 900a36d8f062d633ac6351f16a5ae16596a03174..ef416e5caeea1c9b2b60ff3c8fe8773ba88008e7 100644 (file)
--- a/src/resolve/resolved.c
+++ b/src/resolve/resolved.c
@@ -38,14 +38,20 @@ int main(int argc, char *argv[]) {
         log_parse_environment();
         log_open();
 
-        umask(0022);
-
         if (argc != 1) {
                 log_error("This program takes no arguments.");
                 r = -EINVAL;
                 goto finish;
         }
 
+        umask(0022);
+
+        r = label_init(NULL);
+        if (r < 0) {
+                log_error("SELinux setup failed: %s", strerror(-r));
+                goto finish;
+        }
+
         r = get_user_creds(&user, &uid, &gid, NULL, NULL);
         if (r < 0) {
                 log_error("Cannot resolve user name %s: %s", user, strerror(-r));
@@ -75,6 +81,12 @@ int main(int argc, char *argv[]) {
         if (r < 0)
                 log_warning("Failed to parse configuration file: %s", strerror(-r));
 
+        r = manager_start(m);
+        if (r < 0) {
+                log_error("Failed to start manager: %s", strerror(-r));
+                goto finish;
+        }
+
         /* Write finish default resolv.conf to avoid a dangling
          * symlink */
         r = manager_write_resolv_conf(m);
@@ -91,8 +103,12 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
+        sd_event_get_exit_code(m->event, &r);
+
 finish:
-        sd_notify(false, "STATUS=Shutting down...");
+        sd_notify(false,
+                  "STOPPIN=1\n"
+                  "STATUS=Shutting down...");
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }