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
From 375ae4aa4d2f89ae8afdd27e9f2b8336fcc2a046 Mon Sep 17 00:00:00 2001
|
|
From: Uoti Urpala <uoti.urpala@pp1.inet.fi>
|
|
Date: Mon, 23 Jun 2014 16:50:03 +0300
|
|
Subject: [PATCH] core/transaction: fix cycle break attempts outside
|
|
transaction
|
|
|
|
Patch fixes some incorrect-looking code in transaction.c.
|
|
It could fix cases where Debian users with bad package configurations
|
|
had systemd go into an infinite loop printing messages about breaking an
|
|
ordering cycle, though I have not reproduced that problem myself.
|
|
|
|
transaction_verify_order_one() considers jobs/units outside current
|
|
transaction when checking whether ordering dependencies cause cycles.
|
|
It would also incorrectly try to break cycles at these jobs; this
|
|
cannot work, as the break action is to remove the job from the
|
|
transaction, which is a no-op if the job isn't part of the transaction
|
|
to begin with. The unit_matters_to_anchor() test also looks like it
|
|
would not work correctly for non-transaction jobs. Add a check to
|
|
verify that the unit is part of the transaction before considering a
|
|
job a candidate for deletion.
|
|
|
|
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752259
|
|
---
|
|
src/core/transaction.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git src/core/transaction.c src/core/transaction.c
|
|
index d23a45c..805d40a 100644
|
|
--- src/core/transaction.c
|
|
+++ src/core/transaction.c
|
|
@@ -381,7 +381,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi
|
|
"Found dependency on %s/%s",
|
|
k->unit->id, job_type_to_string(k->type));
|
|
|
|
- if (!delete &&
|
|
+ if (!delete && hashmap_get(tr->jobs, k->unit) &&
|
|
!unit_matters_to_anchor(k->unit, k)) {
|
|
/* Ok, we can drop this one, so let's
|
|
* do so. */
|
|
--
|
|
1.7.9.2
|
|
|