forked from pool/systemd
6a62c05e32
- Add upstream patches as real fixes 0001-activate-fix-fd-leak-in-do_accept.patch 0002-analyze-avoid-a-null-dereference.patch 0003-analyze-fix-mem-leak.patch 0004-backlight-Avoid-error-when-state-restore-is-disabled.patch 0005-bus-avoid-using-m-kdbus-after-freeing-it.patch 0006-bus-unref-buscreds-on-failure.patch 0007-core-fix-a-potential-mem-leak.patch 0008-core-smack-setup-Actually-allow-for-succesfully-load.patch 0009-journal-do-not-leak-mmaps-on-OOM.patch 0010-manager-use-correct-cleanup-function.patch - Intergrate the work of Robert and rename the patch 1068-udev-remove-userspace-firmware-loading-support.patch to 1078-udev-remove-userspace-firmware-loading-support.patch Also add patch 1079-udev-remove-userspace-firmware-loading-support.patch to apply the same change for opensuse 13.2 and above - Add upstream patch 0001-systemctl-allow-to-change-the-default-target-without.patch to allow to override default target without --force (bnc#896664) - Add upstream patches for udev 1068-udev-net_setup_link-export-the-.link-filename-applie.patch 1069-rules-net-setup-link-preserve-ID_NET_LINK_FILE-and-I.patch 1070-rules-net-setup-link-remove-stray-linebreak.patch 1071-udev-import-the-full-db-on-MOVE-events-for-devices-w.patch 1072-udev-netif_rename-don-t-log-to-kmsg.patch 1073-udev-drop-print_kmsg.patch 1074-udev-fix-copy-paste-error-in-log-message.patch OBS-URL: https://build.opensuse.org/request/show/249581 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=206
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From b76388e123e8d73ded1fd53937d816b314948517 Mon Sep 17 00:00:00 2001
|
|
From: Michael Biebl <biebl@debian.org>
|
|
Date: Thu, 11 Sep 2014 00:49:36 +0200
|
|
Subject: [PATCH] backlight: Avoid error when state restore is disabled
|
|
|
|
When the state restore is disabled, we would print:
|
|
"Unknown verb: load" instead of simply skipping loading the
|
|
state.
|
|
---
|
|
src/backlight/backlight.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git src/backlight/backlight.c src/backlight/backlight.c
|
|
index 4d94ebf..0a2bac6 100644
|
|
--- src/backlight/backlight.c
|
|
+++ src/backlight/backlight.c
|
|
@@ -372,9 +372,12 @@ int main(int argc, char *argv[]) {
|
|
* device probing should be complete), so that the validity
|
|
* check at boot time doesn't have to be reliable. */
|
|
|
|
- if (streq(argv[1], "load") && shall_restore_state()) {
|
|
+ if (streq(argv[1], "load")) {
|
|
_cleanup_free_ char *value = NULL;
|
|
|
|
+ if (!shall_restore_state())
|
|
+ return EXIT_SUCCESS;
|
|
+
|
|
if (!validate_device(udev, device))
|
|
return EXIT_SUCCESS;
|
|
|
|
--
|
|
1.7.9.2
|
|
|