Merge pull request #2565 from poettering/fix-2315

diff --cc src/core/transaction.c
index 0d53e4bac0c10fd8048e2b7195357128963bb67a,099df4f3f7039871e26d4641e115cee4c285b255..00d88f1b6c02d6b114213c3c152d597d2a98b65e
--- 1/src/core/transaction.c
--- 2/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 e0e1e604f81d54b57b646c67dce559399abd2837,7f1f829c3624ad8ce3d4db4f243338a36b2982f6..3e3527f894478528cbf65caf47b3da1cf80b8314
--- 1/units/basic.target
--- 2/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