[systemd-commits] 3 commits - Makefile.am src/service.c TODO units/arch

[Lennart Poettering]

 Makefile.am                 |    6 ---
 TODO                        |    4 ++
 src/service.c               |   67 --------------------------------------------
 units/arch/rc-local.service |   19 ------------
 4 files changed, 4 insertions(+), 92 deletions(-)

New commits:
commit b24a167b6f0f9a44686736734e6d0cec07e1efa3
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Jan 17 22:41:53 2011 +0100

    update TODO

diff --git a/TODO b/TODO
index 8d49810..75b3c03 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,7 @@
+* FAT uuids are uppercase, systemd refers to them in lowercase, breakage (mjg59)
+
+* make usage of SIGKILL when shutting down services optional
+
 * figure out what happened to bluez patch
 
 * in pam_systemd: add option to kill normal user sessions on logout but only those with uid != 0

commit dda9be8a99b177dc762fc1e5d27e4fcb5e977a80
Author: Tom Gundersen <teg at jklm.no>
Date:   Sun Jan 16 01:46:34 2011 +0100

    arch: remove rc-local.service
    
    This is now shipped downstream.

diff --git a/Makefile.am b/Makefile.am
index 91bcb0f..b594b65 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -341,12 +341,6 @@ dist_systemunit_DATA += \
 	units/fedora/plymouth-halt.service
 endif
 
-
-if TARGET_ARCH
-dist_systemunit_DATA += \
-	units/arch/rc-local.service
-endif
-
 dist_doc_DATA = \
 	README \
 	LICENSE \
diff --git a/units/arch/rc-local.service b/units/arch/rc-local.service
deleted file mode 100644
index 7e2b5b6..0000000
--- a/units/arch/rc-local.service
+++ /dev/null
@@ -1,19 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=/etc/rc.local Compatibility
-
-[Service]
-ExecStart=/etc/rc.local
-ExecStop=/etc/rc.local.shutdown
-TimeoutSec=0
-StandardInput=tty
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target

commit 521e05c7cec9148ed046a1f2f525c3395eb9092a
Author: Tom Gundersen <teg at jklm.no>
Date:   Sun Jan 16 01:46:33 2011 +0100

    arch: remove support for legacy daemons
    
    This is now done by a generator, shipped downstream.

diff --git a/src/service.c b/src/service.c
index a28eb8a..e4dfa40 100644
--- a/src/service.c
+++ b/src/service.c
@@ -247,11 +247,6 @@ static char *sysv_translate_name(const char *name) {
                 /* Drop SuSE-style boot. prefix */
                 strcpy(stpcpy(r, name + 5), ".service");
 #endif
-#ifdef TARGET_ARCH
-        if (startswith(name, "@"))
-                /* Drop Arch-style background prefix */
-                strcpy(stpcpy(r, name + 1), ".service");
-#endif
 #ifdef TARGET_FRUGALWARE
         if (startswith(name, "rc."))
                 /* Drop Frugalware-style rc. prefix */
@@ -2872,67 +2867,9 @@ static int service_enumerate(Manager *m) {
         Unit *service;
         Iterator j;
         int r;
-#ifdef TARGET_ARCH
-        Unit *previous = NULL;
-        char *arch_daemons = NULL;
-        char *arch_daemons_stripped = NULL;
-        char **arch_daemons_split = NULL;
-#endif
 
         assert(m);
 
-#ifdef TARGET_ARCH
-        if ((r = parse_env_file("/etc/rc.conf", NEWLINE,
-                                "DAEMONS", &arch_daemons,
-                                NULL)) < 0) {
-
-                if (r != -ENOENT)
-                        log_warning("Failed to read /etc/rc.conf: %s", strerror(-r));
-
-        } else if (arch_daemons) {
-                if (!(arch_daemons_stripped = strchr(arch_daemons, '(')))
-                        arch_daemons_stripped = arch_daemons;
-                else
-                        arch_daemons_stripped++; /* strip start paren */
-
-                arch_daemons_stripped[strcspn(arch_daemons_stripped, ")")] = 0; /* strip end paren */
-
-                if (!(arch_daemons_split = strv_split_quoted(arch_daemons_stripped))) {
-                        r = -ENOMEM;
-                        goto finish;
-                }
-
-                STRV_FOREACH(p, arch_daemons_split) {
-
-                        free(name);
-                        name = NULL;
-
-                        if (**p == '!') /* daemons prefixed with ! are disabled, so ignore them */
-                                continue;
-
-                        if (!(name = sysv_translate_name(*p))) {
-                                r = -ENOMEM;
-                                goto finish;
-                        }
-
-                        if ((r = manager_load_unit_prepare(m, name, NULL, NULL, &service)) < 0) {
-                                log_warning("Failed to prepare unit %s: %s", name, strerror(-r));
-                                continue;
-                        }
-
-                        if ((r = unit_add_two_dependencies_by_name_inverse(service, UNIT_AFTER, UNIT_WANTS, "multi-user.target", NULL, true)) < 0)
-                                goto finish;
-
-                        if (previous)
-                                if ((r = unit_add_dependency(service, UNIT_AFTER, previous, true)) < 0)
-                                        goto finish;
-
-                        if (**p != '@') /* daemons prefixed with @ can be started in the background */
-                                previous = service;
-                }
-        }
-#endif
-
         zero(runlevel_services);
 
         STRV_FOREACH(p, m->lookup_paths.sysvrcnd_path)
@@ -3070,10 +3007,6 @@ finish:
         free(path);
         free(fpath);
         free(name);
-#ifdef TARGET_ARCH
-        free(arch_daemons);
-        free(arch_daemons_split);
-#endif
 
         for (i = 0; i < ELEMENTSOF(rcnd_table); i++)
                 set_free(runlevel_services[i]);