← Back to branch summary

~ubuntu-branches/debian/jessie/systemd/jessie

« back to all changes in this revision

Viewing changes to src/load-dropin.c

  • Committer: Package Import Robot
  • Author(s): Tollef Fog Heen, Tollef Fog Heen, Michael Biebl
  • Date: 2012-04-03 19:59:17 UTC
  • mfrom: (1.1.10) (6.1.3 experimental)
  • Revision ID: package-import@ubuntu.com-20120403195917-l532urrbg4pkreas
Tags: 44-1
http://bugs.debian.org/664364
http://bugs.debian.org/663219
http://bugs.debian.org/663323
[ Tollef Fog Heen ]
* New upstream version.
  - Backport 3492207: journal: PAGE_SIZE is not known on ppc and other
    archs
  - Backport 5a2a2a1: journal: react with immediate rotation to a couple
    of more errors
  - Backport 693ce21: util: never follow symlinks in rm_rf_children()
    Fixes CVE-2012-1174, closes: #664364
* Drop output message from init-functions hook, it's pointless.
* Only rmdir /lib/init/rw if it exists.
* Explicitly order debian-fixup before sysinit.target to prevent a
  possible race condition with the creation of sockets.  Thanks to
  Michael Biebl for debugging this.
* Always restart the initctl socket on upgrades, to mask sysvinit
  removing it.

[ Michael Biebl ]
* Remove workaround for non-interactive sessions from pam config again.
* Create compat /dev/initctl symlink in case we are upgrading from a system
  running a newer version of sysvinit (using /run/initctl) and sysvinit is
  replaced with systemd-sysv during the upgrade. Closes: #663219
* Install new man pages.
* Build-Depend on valac (>= 0.12) instead of valac-0.12. Closes: #663323

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/load-dropin.c
61
61
                free(f);
62
62
 
63
63
                if (r < 0)
64
 
                        log_error("Cannot add dependency %s to %s, ignoring: %s", de->d_name, u->meta.id, strerror(-r));
 
64
                        log_error("Cannot add dependency %s to %s, ignoring: %s", de->d_name, u->id, strerror(-r));
65
65
        }
66
66
 
67
67
        r = 0;
84
84
        if (!path)
85
85
                return -ENOMEM;
86
86
 
87
 
        if (u->meta.manager->unit_path_cache &&
88
 
            !set_get(u->meta.manager->unit_path_cache, path))
 
87
        if (u->manager->unit_path_cache &&
 
88
            !set_get(u->manager->unit_path_cache, path))
89
89
                r = 0;
90
90
        else
91
91
                r = iterate_dir(u, path, dependency);
94
94
        if (r < 0)
95
95
                return r;
96
96
 
97
 
        if (u->meta.instance) {
 
97
        if (u->instance) {
98
98
                char *template;
99
99
                /* Also try the template dir */
100
100
 
108
108
                if (!path)
109
109
                        return -ENOMEM;
110
110
 
111
 
                if (u->meta.manager->unit_path_cache &&
112
 
                    !set_get(u->meta.manager->unit_path_cache, path))
 
111
                if (u->manager->unit_path_cache &&
 
112
                    !set_get(u->manager->unit_path_cache, path))
113
113
                        r = 0;
114
114
                else
115
115
                        r = iterate_dir(u, path, dependency);
130
130
 
131
131
        /* Load dependencies from supplementary drop-in directories */
132
132
 
133
 
        SET_FOREACH(t, u->meta.names, i) {
 
133
        SET_FOREACH(t, u->names, i) {
134
134
                char **p;
135
135
 
136
 
                STRV_FOREACH(p, u->meta.manager->lookup_paths.unit_path) {
 
136
                STRV_FOREACH(p, u->manager->lookup_paths.unit_path) {
137
137
                        int r;
138
138
 
139
139
                        r = process_dir(u, *p, t, ".wants", UNIT_WANTS);