forked from pool/systemd
9fc3254595
- Update of patch 0001-detect-s390-virt.patch (bnc#880438) - Shut up stupid check scripts crying for not mentioned systemd-mini-rpmlintrc - Add upstream patchs 0001-core-use-correct-format-string-for-UIDs.patch 0002-core-transaction-fix-cycle-break-attempts-outside-tr.patch 0003-fsck-consider-a-fsck-implementation-linked-to-bin-tr.patch - Add upstream patch 0001-units-order-network-online.target-after-network.targ.patch to make sure that etwork-online.target follows network.target - rules: re-enable dev_id conditionally in persistent rules (bnc#884403 and bnc#882714). Add 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch - Add upstream patches 0001-vconsole-also-copy-character-maps-not-just-fonts-fro.patch 0002-core-make-sure-Environment-fields-passed-in-for-tran.patch 0003-core-You-can-not-put-the-cached-result-of-use_smack-.patch 0004-cryptsetup-don-t-add-unit-dependency-on-dev-null-dev.patch 0005-man-fix-path-in-crypttab-5.patch - Add upstream patch 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch it fixes udevadm settle exit code which may had roken dracut scripts (bnc#884271 comment#18) - Temporary disable patch 1022 (bnc#884271 and bnc#882714). OBS-URL: https://build.opensuse.org/request/show/238853 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=190
43 lines
1.9 KiB
Diff
43 lines
1.9 KiB
Diff
Based on 04ef5b03f64d3824a51a2a903548af029a006744 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Sun, 22 Jun 2014 14:04:23 -0400
|
|
Subject: [PATCH] core/transaction: avoid misleading error message when unit
|
|
not found
|
|
|
|
There's no point in telling the user to look at the logs when
|
|
an attempt to load the unit file failed with ENOENT.
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=996133
|
|
---
|
|
TODO | 4 ----
|
|
src/core/transaction.c | 18 ++++++++++++------
|
|
2 files changed, 12 insertions(+), 10 deletions(-)
|
|
|
|
--- src/core/transaction.c
|
|
+++ src/core/transaction.c 2014-06-24 11:18:42.746235805 +0000
|
|
@@ -865,12 +865,18 @@ int transaction_add_job_and_dependencies
|
|
}
|
|
|
|
if (type != JOB_STOP && unit->load_state == UNIT_ERROR) {
|
|
- sd_bus_error_setf(e, BUS_ERROR_LOAD_FAILED,
|
|
- "Unit %s failed to load: %s. "
|
|
- "See system logs and 'systemctl status %s' for details.",
|
|
- unit->id,
|
|
- strerror(-unit->load_error),
|
|
- unit->id);
|
|
+ if (unit->load_error == -ENOENT)
|
|
+ sd_bus_error_setf(e, BUS_ERROR_LOAD_FAILED,
|
|
+ "Unit %s failed to load: %s.",
|
|
+ unit->id,
|
|
+ strerror(-unit->load_error));
|
|
+ else
|
|
+ sd_bus_error_setf(e, BUS_ERROR_LOAD_FAILED,
|
|
+ "Unit %s failed to load: %s. "
|
|
+ "See system logs and 'systemctl status %s' for details.",
|
|
+ unit->id,
|
|
+ strerror(-unit->load_error),
|
|
+ unit->id);
|
|
return -EINVAL;
|
|
}
|
|
|