799437355d
- Add upstream patch 0001-systemd-tmpfiles-Fix-IGNORE_DIRECTORY_PATH-age-handl.patch for bsc#893797 - Drop renaming virtual interfaces in a guest (bnc#898432). Add 1088-drop-renaming-of-virtual-interfaces-in-guest.patch - Rename patch 0001-infinit-timeout-for-kmod-loaded-modules.patch to patch 1087-infinit-timeout-for-kmod-loaded-modules.patch and apply this one - Change patch 0003-mount-order-options-before-other-arguments-to-mount.patch to fix bsc#898240 - Add upstream patches 0001-Fix-warning-about-unused-variable-with-SELINUX.patch 0002-bus-remove-unused-check.patch - Add patch 0001-infinit-timeout-for-kmod-loaded-modules.patch to be able to avoid killing a running kmod/modprobe (bnc#889297) - Update patch 0001-bnc888612-logind-polkit-acpi.patch - Add upstream patches 0001-login-pause-devices-before-acknowledging-VT-switches.patch May help that history of the shell is saved 0001-nspawn-don-t-try-to-create-veth-link-with-too-long-i.patch 0001-socket-introduce-SELinuxContextFromNet-option.patch (bsc#897801) 0002-util-avoid-non-portable-__WORDSIZE.patch OBS-URL: https://build.opensuse.org/request/show/252537 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=208
32 lines
835 B
Diff
32 lines
835 B
Diff
From 493d521d9ffe706741665a88ea14929913ea2eaf Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Tue, 23 Sep 2014 09:22:40 -0400
|
|
Subject: [PATCH] Fix warning about unused variable with !SELINUX
|
|
|
|
src/shared/label.c:255:15: warning: unused variable 'l' [-Wunused-variable]
|
|
char *l = NULL;
|
|
^
|
|
---
|
|
src/shared/label.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git src/shared/label.c src/shared/label.c
|
|
index 02b41f0..b6af38d 100644
|
|
--- src/shared/label.c
|
|
+++ src/shared/label.c
|
|
@@ -252,9 +252,10 @@ fail:
|
|
|
|
int label_get_our_label(char **label) {
|
|
int r = -EOPNOTSUPP;
|
|
- char *l = NULL;
|
|
|
|
#ifdef HAVE_SELINUX
|
|
+ char *l = NULL;
|
|
+
|
|
r = getcon(&l);
|
|
if (r < 0)
|
|
return r;
|
|
--
|
|
1.7.9.2
|
|
|