forked from pool/systemd
98c62cc989
- remove patch sysctl-handle-boot-sysctl.conf-kernel_release.patch from the filelist. - libpcre, glib2 and libusb are not used by systemd, remove from buildrequires. - 1032-ata_id-unbotch-format-specifier.patch: fix udev ata_id output. - 0023-core-fix-reversed-dependency-check-in-unit_check_unn.patch fix StopWhenUnneeded=true in combination with a Requisite= dependency. - 0031-install-fix-bad-memory-access.patch: Fix Bad memory access - 0006-pam_systemd-Properly-check-kdbus-availability.patch: if kdbus is enabled (i.e boot with kdbus=1) DBUS_SESSION_BUS_ADDRESS must not be exported. - spec: add a min_kernel_version macro to ensure the package conflicts with kernel versions in which systemd cannot run. - sysctl-handle-boot-sysctl.conf-kernel_release.patch dropped, replaced by a tmpfiles.d snippet "current-kernel-sysctl.conf" (feature implemented in v220 just for our usecase) - fix build when resolved is enabled - remove fsck -l test in spec file, systemd requires util-linux 2.26 or later where this feature is already available. - remove patch sysctl-handle-boot-sysctl.conf-kernel_release.patch from the filelist. - libpcre, glib2 and libusb are not used by systemd, remove OBS-URL: https://build.opensuse.org/request/show/313718 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=878
29 lines
967 B
Diff
29 lines
967 B
Diff
From 084918ba41acbb80076c64e7338cf73101b1385e Mon Sep 17 00:00:00 2001
|
|
From: Abdo Roig-Maranges <abdo.roig@gmail.com>
|
|
Date: Tue, 23 Jun 2015 11:13:13 +0200
|
|
Subject: [PATCH 23/32] core: fix reversed dependency check in
|
|
unit_check_unneeded
|
|
|
|
This was introduced by commit be7d9ff730cb88d7c6a8 and breaks
|
|
StopWhenUnneeded=true in the presence of a Requisite dependency.
|
|
---
|
|
src/core/unit.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/core/unit.c b/src/core/unit.c
|
|
index 7bb2afc..fac017c 100644
|
|
--- a/src/core/unit.c
|
|
+++ b/src/core/unit.c
|
|
@@ -1596,7 +1596,7 @@ static void unit_check_unneeded(Unit *u) {
|
|
static const UnitDependency needed_dependencies[] = {
|
|
UNIT_REQUIRED_BY,
|
|
UNIT_REQUIRED_BY_OVERRIDABLE,
|
|
- UNIT_REQUISITE,
|
|
+ UNIT_REQUISITE_OF,
|
|
UNIT_REQUISITE_OF_OVERRIDABLE,
|
|
UNIT_WANTED_BY,
|
|
UNIT_BOUND_BY,
|
|
--
|
|
2.4.3
|
|
|