forked from pool/systemd
52ccc3aadb
- 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
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From ec62e858734a66130f68d036c55c2050bde1e52e Mon Sep 17 00:00:00 2001
|
|
From: Jan Engelhardt <jengelh@inai.de>
|
|
Date: Wed, 24 Jun 2015 01:48:18 +0200
|
|
Subject: [PATCH 32/32] ata_id: unbotch format specifier
|
|
|
|
Commit v218-247-g11c6f69 broke the output of the utility. "%1$" PRIu64
|
|
"x" expands to "%1$lux", essentially "%lux", which shows the problem.
|
|
u and x cannot be combined, u wins as the type character, and x gets
|
|
emitted verbatim to stdout.
|
|
|
|
References: https://bugzilla.redhat.com/show_bug.cgi?id=1227503
|
|
---
|
|
src/udev/ata_id/ata_id.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
|
|
index cc1bf45..7ba0b7f 100644
|
|
--- a/src/udev/ata_id/ata_id.c
|
|
+++ b/src/udev/ata_id/ata_id.c
|
|
@@ -639,8 +639,8 @@ int main(int argc, char *argv[])
|
|
*/
|
|
word = identify.wyde[108];
|
|
if ((word & 0xf000) == 0x5000)
|
|
- printf("ID_WWN=0x%1$"PRIu64"x\n"
|
|
- "ID_WWN_WITH_EXTENSION=0x%1$"PRIu64"x\n",
|
|
+ printf("ID_WWN=0x%1$" PRIx64 "\n"
|
|
+ "ID_WWN_WITH_EXTENSION=0x%1$" PRIx64 "\n",
|
|
identify.octa[108/4]);
|
|
|
|
/* from Linux's include/linux/ata.h */
|
|
--
|
|
2.4.3
|
|
|