[systemd-commits] 2 commits - src/core src/shared

[Zbigniew Jędrzejewski-Szmek]

 src/core/unit.h      |   18 +++++++++---------
 src/shared/install.c |    2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit e95c98378ac2d34df864de4a9b785fd17defb77b
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat Oct 25 15:15:28 2014 -0400

    systemctl: do not ignore errors in symlink removal
    
    On an ro fs, systemctl disable ... would fail silently.

diff --git a/src/shared/install.c b/src/shared/install.c
index 0d7c30e..035b44c 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1679,7 +1679,7 @@ int unit_file_disable(
         r = install_context_mark_for_removal(&c, &paths, &remove_symlinks_to, config_path, root_dir);
 
         q = remove_marked_symlinks(remove_symlinks_to, config_path, changes, n_changes, files);
-        if (r == 0)
+        if (r >= 0)
                 r = q;
 
         return r;

commit 7c52a17b1a31eedd40093a4fbb460cf492087d9b
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Fri Oct 24 16:09:35 2014 -0400

    Rearrange Unit to make pahole happy
    
    After all we have lots of those.

diff --git a/src/core/unit.h b/src/core/unit.h
index a773762..43ab4d1 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -127,12 +127,6 @@ struct Unit {
         dual_timestamp active_exit_timestamp;
         dual_timestamp inactive_enter_timestamp;
 
-        /* Counterparts in the cgroup filesystem */
-        char *cgroup_path;
-        CGroupControllerMask cgroup_realized_mask;
-        CGroupControllerMask cgroup_subtree_mask;
-        CGroupControllerMask cgroup_members_mask;
-
         UnitRef slice;
 
         /* Per type list */
@@ -176,6 +170,15 @@ struct Unit {
         /* Cached unit file state */
         UnitFileState unit_file_state;
 
+        /* Counterparts in the cgroup filesystem */
+        char *cgroup_path;
+        CGroupControllerMask cgroup_realized_mask;
+        CGroupControllerMask cgroup_subtree_mask;
+        CGroupControllerMask cgroup_members_mask;
+
+        /* How to start OnFailure units */
+        JobMode on_failure_job_mode;
+
         /* Garbage collect us we nobody wants or requires us anymore */
         bool stop_when_unneeded;
 
@@ -191,9 +194,6 @@ struct Unit {
         /* Allow isolation requests */
         bool allow_isolate;
 
-        /* How to start OnFailure units */
-        JobMode on_failure_job_mode;
-
         /* Ignore this unit when isolating */
         bool ignore_on_isolate;