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

[Lennart Poettering]

 TODO               |    3 +++
 src/core/service.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a9602630c64791571ca37606a0a5eabfac85820a
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Mar 25 17:25:48 2013 +0100

    update TODO

diff --git a/TODO b/TODO
index 132aeac..8227792 100644
--- a/TODO
+++ b/TODO
@@ -43,6 +43,9 @@ Fedora 19:
   http://lists.freedesktop.org/archives/systemd-devel/2013-February/009021.html
 
 Features:
+
+* when prompting for a hdd password show GUID partition label
+
 * teach udev + logind's uaccess to somehow handle the "dead" device nodes from:
      /lib/modules/$(uname -r)/modules.devname
   and apply ACLs to them if they have TAG=="uaccess" in udev rules.

commit ce2c2265376c22c16b4c9bff3ac2d402ddbeda03
Author: Frederic Crozat <fcrozat at suse.com>
Date:   Thu Mar 21 15:40:45 2013 +0100

    core: ensure LSB Provides are handled correctly
    
    Let's say you have two initscripts, A and B:
    
    A contains in its LSB header:
    Required-Start: C
    
    and B contains in its LSB header:
    Provides: C
    
    When systemd is parsing /etc/rc.d/, depending on the file order, you
    can end up with either:
    - B is parsed first. An unit "C.service" will be "created" and will be
    added as additional name to B.service, with unit_add_name. No bug.
    - A is parsed first. An unit "C.service" is created for the
    "Required-Start" dependency (it will have no file attached, since
    nothing provides this dependency yet). Then B is parsed and when trying
    to handle "Provides: C", unit_add_name is called but will fail, because
    "C.service" already exists in manager->units. Therefore, a merge should
    occur for that case.

diff --git a/src/core/service.c b/src/core/service.c
index 4451d38..fa8a1cb 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -762,7 +762,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
                                                 continue;
 
                                         if (unit_name_to_type(m) == UNIT_SERVICE)
-                                                r = unit_add_name(u, m);
+                                                r = unit_merge_by_name(u, m);
                                         else
                                                 /* NB: SysV targets
                                                  * which are provided