diff options
| -rw-r--r-- | src/core/transaction.c | 2 | ||||
| -rw-r--r-- | units/basic.target | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/core/transaction.c b/src/core/transaction.c index 099df4f3f7..00d88f1b6c 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -934,7 +934,7 @@ int transaction_add_job_and_dependencies( if (r < 0) { /* unit masked, job type not applicable and unit not found are not considered as errors. */ log_unit_full(dep, - 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 --git a/units/basic.target b/units/basic.target index 7f1f829c36..3e3527f894 100644 --- a/units/basic.target +++ b/units/basic.target @@ -12,8 +12,9 @@ Requires=sysinit.target Wants=sockets.target timers.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 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 |