From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 10 Feb 2016 00:08:16 +0000 (-0500)
Subject: Merge pull request #2565 from poettering/fix-2315
X-Git-Tag: v229~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c6d5a179e0e59d3d6eb6a5ad281d88af62d2058;p=thirdparty%2Fsystemd.git

Merge pull request #2565 from poettering/fix-2315
---

9c6d5a179e0e59d3d6eb6a5ad281d88af62d2058
diff --cc src/core/transaction.c
index 0d53e4bac0c,099df4f3f70..00d88f1b6c0
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@@ -932,9 -932,9 +932,9 @@@ int transaction_add_job_and_dependencie
                          SET_FOREACH(dep, ret->unit->dependencies[UNIT_WANTS], i) {
                                  r = transaction_add_job_and_dependencies(tr, JOB_START, dep, ret, false, false, false, ignore_order, e);
                                  if (r < 0) {
-                                         /* unit masked and unit not found are not considered as errors. */
+                                         /* unit masked, job type not applicable and unit not found are not considered as errors. */
                                          log_unit_full(dep,
-                                                       r == -EBADR || r == -ENOENT ? LOG_DEBUG : LOG_WARNING,
 -                                                      r == -ESHUTDOWN || r == -EBADR || r == -ENOENT ? LOG_DEBUG : LOG_WARNING,
++                                                      IN_SET(r, -ESHUTDOWN, -EBADR, -ENOENT) ? LOG_DEBUG : LOG_WARNING,
                                                        r, "Cannot add dependency job, ignoring: %s",
                                                        bus_error_message(e, r));
                                          sd_bus_error_free(e);
diff --cc units/basic.target
index e0e1e604f81,7f1f829c362..3e3527f8944
--- a/units/basic.target
+++ b/units/basic.target
@@@ -10,8 -10,10 +10,11 @@@ Description=Basic Syste
  Documentation=man:systemd.special(7)
  Requires=sysinit.target
  Wants=sockets.target timers.target paths.target slices.target
- After=sysinit.target sockets.target paths.target slices.target
+ After=sysinit.target sockets.target paths.target slices.target tmp.mount
  
 -# We support /var, /tmp, /var/tmp, being on NFS, but we don't pull in remote-fs.target by default, hence pull them in
 -# explicitly here. Note that we require /var and /var/tmp, but only add a Wants= type dependency on /tmp, as we support
 -# that unit being masked, and this should not be considered an error.
 +# We support /var, /tmp, /var/tmp, being on NFS, but we don't pull in
- # remote-fs.target by default, hence explicitly pull /var in here.
- RequiresMountsFor=/var /tmp /var/tmp
++# remote-fs.target by default, hence pull them in explicitly here. Note that we
++# require /var and /var/tmp, but only add a Wants= type dependency on /tmp, as
++# we support that unit being masked, and this should not be considered an error.
+ RequiresMountsFor=/var /var/tmp
+ Wants=tmp.mount