core: add transient units

[elogind.git] / src / core / mount.c

diff --git a/src/core/mount.c b/src/core/mount.c
index 51a81a948870529d520e761f55456794800436c2..3cc3e65b234a9cd867887c8883a66c127e4f9930 100644 (file)
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -82,6 +82,7 @@ static void mount_init(Unit *u) {
         }
 
         kill_context_init(&m->kill_context);
         }
 
         kill_context_init(&m->kill_context);

+        cgroup_context_init(&m->cgroup_context);

 
         /* We need to make sure that /bin/mount is always called in
          * the same process group as us, so that the autofs kernel
 
         /* We need to make sure that /bin/mount is always called in
          * the same process group as us, so that the autofs kernel


@@ -127,6 +128,7 @@ static void mount_done(Unit *u) {
         mount_parameters_done(&m->parameters_proc_self_mountinfo);
         mount_parameters_done(&m->parameters_fragment);
 
         mount_parameters_done(&m->parameters_proc_self_mountinfo);
         mount_parameters_done(&m->parameters_fragment);
 

+        cgroup_context_done(&m->cgroup_context);

         exec_context_done(&m->exec_context, manager_is_reloading_or_reexecuting(u->manager));
         exec_command_done_array(m->exec_command, _MOUNT_EXEC_COMMAND_MAX);
         m->control_command = NULL;
         exec_context_done(&m->exec_context, manager_is_reloading_or_reexecuting(u->manager));
         exec_command_done_array(m->exec_command, _MOUNT_EXEC_COMMAND_MAX);
         m->control_command = NULL;


@@ -136,7 +138,7 @@ static void mount_done(Unit *u) {
         unit_unwatch_timer(u, &m->timer_watch);
 }
 
         unit_unwatch_timer(u, &m->timer_watch);
 }
 

-static MountParameters* get_mount_parameters_fragment(Mount *m) {
+_pure_ static MountParameters* get_mount_parameters_fragment(Mount *m) {

         assert(m);
 
         if (m->from_fragment)
         assert(m);
 
         if (m->from_fragment)


@@ -145,7 +147,7 @@ static MountParameters* get_mount_parameters_fragment(Mount *m) {
         return NULL;
 }
 
         return NULL;
 }
 

-static MountParameters* get_mount_parameters(Mount *m) {
+_pure_ static MountParameters* get_mount_parameters(Mount *m) {

         assert(m);
 
         if (m->from_proc_self_mountinfo)
         assert(m);
 
         if (m->from_proc_self_mountinfo)


@@ -293,7 +295,7 @@ static int mount_add_requires_mounts_links(Mount *m) {
 }
 
 static char* mount_test_option(const char *haystack, const char *needle) {
 }
 
 static char* mount_test_option(const char *haystack, const char *needle) {

-        struct mntent me;
+        struct mntent me = { .mnt_opts = (char*) haystack };

 
         assert(needle);
 
 
         assert(needle);
 


@@ -303,9 +305,6 @@ static char* mount_test_option(const char *haystack, const char *needle) {
         if (!haystack)
                 return NULL;
 
         if (!haystack)
                 return NULL;
 

-        zero(me);
-        me.mnt_opts = (char*) haystack;
-

         return hasmntopt(&me, needle);
 }
 
         return hasmntopt(&me, needle);
 }
 


@@ -650,7 +649,7 @@ static int mount_add_extras(Mount *m) {
                         return r;
         }
 
                         return r;
         }
 

-        r = unit_add_default_cgroups(u);
+        r = unit_add_default_slice(u);

         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 


@@ -847,28 +846,31 @@ static int mount_spawn(Mount *m, ExecCommand *c, pid_t *_pid) {
         assert(c);
         assert(_pid);
 
         assert(c);
         assert(_pid);
 

+        unit_realize_cgroup(UNIT(m));
+

         r = unit_watch_timer(UNIT(m), CLOCK_MONOTONIC, true, m->timeout_usec, &m->timer_watch);
         if (r < 0)
                 goto fail;
 
         r = unit_watch_timer(UNIT(m), CLOCK_MONOTONIC, true, m->timeout_usec, &m->timer_watch);
         if (r < 0)
                 goto fail;
 

-        if ((r = exec_spawn(c,
-                            NULL,
-                            &m->exec_context,
-                            NULL, 0,
-                            UNIT(m)->manager->environment,
-                            true,
-                            true,
-                            true,
-                            UNIT(m)->manager->confirm_spawn,
-                            UNIT(m)->cgroup_bondings,
-                            UNIT(m)->cgroup_attributes,
-                            NULL,
-                            UNIT(m)->id,
-                            NULL,
-                            &pid)) < 0)
+        r = exec_spawn(c,
+                       NULL,
+                       &m->exec_context,
+                       NULL, 0,
+                       UNIT(m)->manager->environment,
+                       true,
+                       true,
+                       true,
+                       UNIT(m)->manager->confirm_spawn,
+                       UNIT(m)->cgroup_mask,
+                       UNIT(m)->cgroup_path,
+                       UNIT(m)->id,
+                       NULL,
+                       &pid);
+        if (r < 0)

                 goto fail;
 
                 goto fail;
 

-        if ((r = unit_watch_pid(UNIT(m), pid)) < 0)
+        r = unit_watch_pid(UNIT(m), pid);
+        if (r < 0)

                 /* FIXME: we need to do something here */
                 goto fail;
 
                 /* FIXME: we need to do something here */
                 goto fail;
 


@@ -1263,19 +1265,19 @@ static int mount_deserialize_item(Unit *u, const char *key, const char *value, F
         return 0;
 }
 
         return 0;
 }
 

-static UnitActiveState mount_active_state(Unit *u) {
+_pure_ static UnitActiveState mount_active_state(Unit *u) {

         assert(u);
 
         return state_translation_table[MOUNT(u)->state];
 }
 
         assert(u);
 
         return state_translation_table[MOUNT(u)->state];
 }
 

-static const char *mount_sub_state_to_string(Unit *u) {
+_pure_ static const char *mount_sub_state_to_string(Unit *u) {

         assert(u);
 
         return mount_state_to_string(MOUNT(u)->state);
 }
 
         assert(u);
 
         return mount_state_to_string(MOUNT(u)->state);
 }
 

-static bool mount_check_gc(Unit *u) {
+_pure_ static bool mount_check_gc(Unit *u) {

         Mount *m = MOUNT(u);
 
         assert(m);
         Mount *m = MOUNT(u);
 
         assert(m);


@@ -1541,9 +1543,11 @@ static int mount_add_one(
                 if (r < 0)
                         goto fail;
 
                 if (r < 0)
                         goto fail;
 

-                r = unit_add_dependency_by_name(u, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true);
-                if (r < 0)
-                        goto fail;
+                if (!path_equal(where, "/")) {
+                        r = unit_add_dependency_by_name(u, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true);
+                        if (r < 0)
+                                goto fail;
+                }

 
                 unit_add_to_load_queue(u);
         } else {
 
                 unit_add_to_load_queue(u);
         } else {


@@ -1558,7 +1562,7 @@ static int mount_add_one(
                         }
                 }
 
                         }
                 }
 

-                if (u->load_state == UNIT_ERROR) {
+                if (u->load_state == UNIT_NOT_FOUND) {

                         u->load_state = UNIT_LOADED;
                         u->load_error = 0;
 
                         u->load_state = UNIT_LOADED;
                         u->load_error = 0;
 


@@ -1706,10 +1710,14 @@ static void mount_shutdown(Manager *m) {
 
 static int mount_enumerate(Manager *m) {
         int r;
 
 static int mount_enumerate(Manager *m) {
         int r;

-        struct epoll_event ev;

         assert(m);
 
         if (!m->proc_self_mountinfo) {
         assert(m);
 
         if (!m->proc_self_mountinfo) {

+                struct epoll_event ev = {
+                        .events = EPOLLPRI,
+                        .data.ptr = &m->mount_watch,
+                };
+

                 m->proc_self_mountinfo = fopen("/proc/self/mountinfo", "re");
                 if (!m->proc_self_mountinfo)
                         return -errno;
                 m->proc_self_mountinfo = fopen("/proc/self/mountinfo", "re");
                 if (!m->proc_self_mountinfo)
                         return -errno;


@@ -1717,10 +1725,6 @@ static int mount_enumerate(Manager *m) {
                 m->mount_watch.type = WATCH_MOUNT;
                 m->mount_watch.fd = fileno(m->proc_self_mountinfo);
 
                 m->mount_watch.type = WATCH_MOUNT;
                 m->mount_watch.fd = fileno(m->proc_self_mountinfo);
 

-                zero(ev);
-                ev.events = EPOLLPRI;
-                ev.data.ptr = &m->mount_watch;
-

                 if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->mount_watch.fd, &ev) < 0)
                         return -errno;
         }
                 if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->mount_watch.fd, &ev) < 0)
                         return -errno;
         }


@@ -1875,8 +1879,9 @@ const UnitVTable mount_vtable = {
                 "Mount\0"
                 "Install\0",
 
                 "Mount\0"
                 "Install\0",
 

+        .private_section = "Mount",

         .exec_context_offset = offsetof(Mount, exec_context),
         .exec_context_offset = offsetof(Mount, exec_context),

-        .exec_section = "Mount",
+        .cgroup_context_offset = offsetof(Mount, cgroup_context),

 
         .no_alias = true,
         .no_instances = true,
 
         .no_alias = true,
         .no_instances = true,


@@ -1911,6 +1916,8 @@ const UnitVTable mount_vtable = {
         .bus_interface = "org.freedesktop.systemd1.Mount",
         .bus_message_handler = bus_mount_message_handler,
         .bus_invalidating_properties =  bus_mount_invalidating_properties,
         .bus_interface = "org.freedesktop.systemd1.Mount",
         .bus_message_handler = bus_mount_message_handler,
         .bus_invalidating_properties =  bus_mount_invalidating_properties,

+        .bus_set_property = bus_mount_set_property,
+        .bus_commit_properties = bus_mount_commit_properties,

 
         .enumerate = mount_enumerate,
         .shutdown = mount_shutdown,
 
         .enumerate = mount_enumerate,
         .shutdown = mount_shutdown,