SHA256
1
0
forked from pool/systemd
Dr. Werner Fink 2014-10-14 16:30:43 +00:00 committed by Git OBS Bridge
parent 0ef55bb4aa
commit 1dae32ec85
28 changed files with 1182 additions and 4 deletions

View File

@ -0,0 +1,76 @@
From 3018d31238caabc2e204aa161e647dc1c1b5d1c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 2 Oct 2014 00:11:36 -0400
Subject: [PATCH] core/swap: only make configured units part of swap.target
We used to make all .swap units either RequiredBy=swap.target or
WantedBy=swap.target. But swap.target should be the "configured swap
units", either through /etc/fstab or non-generated .swap units. It
is surprising when systemd starts treating a swap device that was
possibly temporarily enabled as a hard dependency for other units.
So do not add dependencies with swap.target for units gleaned from
/proc/swaps.
Similarly, we added dependencies for all aliases of the device name,
which clutters up the dependency graph but does not seem to bring any
value, since the status of those following units is consistent with
the main one anyway.
This should be a fix for [1], and it seems the right thing to do
anyway.
[1] https://bugzilla.redhat.com/show_bug.cgi?id=1114786
---
src/core/swap.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git src/core/swap.c src/core/swap.c
index ef90d0e..b2ca048 100644
--- src/core/swap.c
+++ src/core/swap.c
@@ -213,7 +213,7 @@ static int swap_add_device_links(Swap *s) {
}
static int swap_add_default_dependencies(Swap *s) {
- bool nofail = false, noauto = false;
+ bool nofail, noauto;
int r;
assert(s);
@@ -228,23 +228,25 @@ static int swap_add_default_dependencies(Swap *s) {
if (r < 0)
return r;
- if (s->from_fragment) {
- SwapParameters *p = &s->parameters_fragment;
+ if (!s->from_fragment)
+ /* The swap unit can either be for an alternative device name, in which
+ * case we don't need to add the dependency on swap.target because this unit
+ * is following a different unit which will have this dependency added,
+ * or it can be derived from /proc/swaps, in which case it was started
+ * manually, and should not become a dependency of swap.target. */
+ return 0;
- nofail = p->nofail;
- noauto = p->noauto;
- }
+ nofail = s->parameters_fragment.nofail;
+ noauto = s->parameters_fragment.noauto;
if (!noauto) {
if (nofail)
r = unit_add_dependency_by_name_inverse(UNIT(s), UNIT_WANTS, SPECIAL_SWAP_TARGET, NULL, true);
else
r = unit_add_two_dependencies_by_name_inverse(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SWAP_TARGET, NULL, true);
- if (r < 0)
- return r;
}
- return 0;
+ return r < 0 ? r : 0;
}
static int swap_verify(Swap *s) {
--
1.7.9.2

View File

@ -0,0 +1,27 @@
From 4bed248505da4da94d82078fe60326a374970e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 26 Sep 2014 10:49:55 -0400
Subject: [PATCH] journalctl: do not output --reboot-- markers when running
non-interactively
They are not legal in the export format.
---
src/journal/journalctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git src/journal/journalctl.c src/journal/journalctl.c
index 47206d3..89a922c 100644
--- src/journal/journalctl.c
+++ src/journal/journalctl.c
@@ -1939,7 +1939,7 @@ int main(int argc, char *argv[]) {
goto finish;
}
- if (!arg_merge) {
+ if (!arg_merge && !arg_quiet) {
sd_id128_t boot_id;
r = sd_journal_get_monotonic_usec(j, NULL, &boot_id);
--
1.7.9.2

View File

@ -0,0 +1,27 @@
From a046659f8551e1c8f79ba4b66472444e285255df Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 7 Oct 2014 11:20:04 +0200
Subject: [PATCH] keymap: Fix touchpad toggle on Toshiba Satellite P75-A7200
Just like everywhere else we use KEY_F21 instead of KEY_TOUCHPAD_TOGGLE for X
friendliness.
---
hwdb/60-keyboard.hwdb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git hwdb/60-keyboard.hwdb hwdb/60-keyboard.hwdb
index 8a1baa7..1fea32a 100644
--- hwdb/60-keyboard.hwdb
+++ hwdb/60-keyboard.hwdb
@@ -1094,7 +1094,7 @@ keyboard:name:Toshiba*input*device:dmi:bvn*:bvr*:bd*:svnTOSHIBA*:pnSatellite*P75
KEYBOARD_KEY_13c=brightnessdown
KEYBOARD_KEY_13d=brightnessup
KEYBOARD_KEY_13e=switchvideomode
- KEYBOARD_KEY_13f=touchpad_toggle
+ KEYBOARD_KEY_13f=f21 # Touchpad toggle
KEYBOARD_KEY_9e=wlan
###########################################################
--
1.7.9.2

View File

@ -0,0 +1,24 @@
From 58d4aabedd415a735efeb8c2608ee73618c07f78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Mon, 22 Sep 2014 22:14:39 -0400
Subject: [PATCH] logind: add support for Triton2 Power Button
https://bugs.freedesktop.org/show_bug.cgi?id=84201
---
src/login/70-power-switch.rules | 1 +
1 file changed, 1 insertion(+)
diff --git src/login/70-power-switch.rules src/login/70-power-switch.rules
index 36fb827..a6997f7 100644
--- src/login/70-power-switch.rules
+++ src/login/70-power-switch.rules
@@ -9,5 +9,6 @@ ACTION=="remove", GOTO="power_switch_end"
SUBSYSTEM=="input", KERNEL=="event*", SUBSYSTEMS=="acpi", TAG+="power-switch"
SUBSYSTEM=="input", KERNEL=="event*", KERNELS=="thinkpad_acpi", TAG+="power-switch"
+SUBSYSTEM=="input", KERNEL=="event*", ATTRS{name}=="twl4030_pwrbutton", TAG+="power-switch"
LABEL="power_switch_end"
--
1.7.9.2

View File

@ -0,0 +1,58 @@
From 92daebc0d0268c35f416c1665e0da3d4be5dd69f Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 11 Jul 2014 16:48:35 +0200
Subject: [PATCH] sd-event: don't require a signal event source to be enabled
for the child event source to work
---
src/libsystemd/sd-event/sd-event.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git src/libsystemd/sd-event/sd-event.c src/libsystemd/sd-event/sd-event.c
index a21f7db..9a9664c 100644
--- src/libsystemd/sd-event/sd-event.c
+++ src/libsystemd/sd-event/sd-event.c
@@ -1919,14 +1919,13 @@ static int process_signal(sd_event *e, uint32_t events) {
int r;
assert(e);
- assert(e->signal_sources);
assert_return(events == EPOLLIN, -EIO);
for (;;) {
struct signalfd_siginfo si;
ssize_t ss;
- sd_event_source *s;
+ sd_event_source *s = NULL;
ss = read(e->signal_fd, &si, sizeof(si));
if (ss < 0) {
@@ -1941,16 +1940,19 @@ static int process_signal(sd_event *e, uint32_t events) {
read_one = true;
- s = e->signal_sources[si.ssi_signo];
if (si.ssi_signo == SIGCHLD) {
r = process_child(e);
if (r < 0)
return r;
- if (r > 0 || !s)
+ if (r > 0)
continue;
- } else
- if (!s)
- return -EIO;
+ }
+
+ if (e->signal_sources)
+ s = e->signal_sources[si.ssi_signo];
+
+ if (!s)
+ continue;
s->signal.siginfo = si;
r = source_set_pending(s, true);
--
1.7.9.2

View File

@ -0,0 +1,30 @@
From b748c7596f79945be5263a0d1c88de64eb0c5146 Mon Sep 17 00:00:00 2001
From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Sat, 27 Sep 2014 00:25:09 +0200
Subject: [PATCH] shutdownd: clean up initialization of struct
No functional change. We just don't assign the value twice.
Found by coverity. Fixes: CID#1237616 and #1237617
---
src/shutdownd/shutdownd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git src/shutdownd/shutdownd.c src/shutdownd/shutdownd.c
index 99aa4b3..0f008a6 100644
--- src/shutdownd/shutdownd.c
+++ src/shutdownd/shutdownd.c
@@ -52,8 +52,8 @@ static int read_packet(int fd, union shutdown_buffer *_b) {
union shutdown_buffer b; /* We maintain our own copy here, in
* order not to corrupt the last message */
struct iovec iovec = {
- iovec.iov_base = &b,
- iovec.iov_len = sizeof(b) - 1,
+ .iov_base = &b,
+ .iov_len = sizeof(b) - 1,
};
union {
struct cmsghdr cmsghdr;
--
1.7.9.2

View File

@ -0,0 +1,52 @@
From 08073121d8171f8e6be27b0c80e2ec283064760e Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 13 Oct 2014 15:43:09 +0200
Subject: [PATCH] systemctl: when mangle unit names for the "isolate", suffix
with ".target" rather than ".service" by default
After all, we set AllowIsolate exclusively for target units so far, and
this is more or less the only thing tht makes sense, hence also use
".target" as completion suffix by default.
---
src/systemctl/systemctl.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git src/systemctl/systemctl.c src/systemctl/systemctl.c
index 842ca6c..af3cc97 100644
--- src/systemctl/systemctl.c
+++ src/systemctl/systemctl.c
@@ -2704,7 +2704,7 @@ static enum action verb_to_action(const char *verb) {
static int start_unit(sd_bus *bus, char **args) {
_cleanup_set_free_free_ Set *s = NULL;
_cleanup_strv_free_ char **names = NULL;
- const char *method, *mode, *one_name;
+ const char *method, *mode, *one_name, *suffix = NULL;
char **name;
int r = 0;
@@ -2717,8 +2717,11 @@ static int start_unit(sd_bus *bus, char **args) {
method = verb_to_method(args[0]);
action = verb_to_action(args[0]);
- mode = streq(args[0], "isolate") ? "isolate" :
- action_table[action].mode ?: arg_job_mode;
+ if (streq(args[0], "isolate")) {
+ mode = "isolate";
+ suffix = ".target";
+ } else
+ mode = action_table[action].mode ?: arg_job_mode;
one_name = action_table[action].target;
} else {
@@ -2734,7 +2737,7 @@ static int start_unit(sd_bus *bus, char **args) {
if (one_name)
names = strv_new(one_name, NULL);
else {
- r = expand_names(bus, args + 1, NULL, &names);
+ r = expand_names(bus, args + 1, suffix, &names);
if (r < 0)
log_error("Failed to expand names: %s", strerror(-r));
}
--
1.7.9.2

View File

@ -0,0 +1,26 @@
From e7aab5412829ed6b50d109f670bd0b1b365838a7 Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Sat, 11 Oct 2014 20:35:06 -0400
Subject: [PATCH] tmpfiles: compare return against correct errno
name_to_handle_at returns -EOPNOTSUPP, not -ENOTSUP.
---
src/tmpfiles/tmpfiles.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git src/tmpfiles/tmpfiles.c src/tmpfiles/tmpfiles.c
index dafb9ae..8108b43 100644
--- src/tmpfiles/tmpfiles.c
+++ src/tmpfiles/tmpfiles.c
@@ -259,7 +259,7 @@ static int dir_is_mount_point(DIR *d, const char *subdir) {
/* got only one handle; assume different mount points if one
* of both queries was not supported by the filesystem */
- if (r_p == -ENOSYS || r_p == -ENOTSUP || r == -ENOSYS || r == -ENOTSUP)
+ if (r_p == -ENOSYS || r_p == -EOPNOTSUPP || r == -ENOSYS || r == -EOPNOTSUPP)
return true;
/* return error */
--
1.7.9.2

View File

@ -0,0 +1,126 @@
From a4a878d04045b46fa9783664e3643a890b356790 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 11 Jun 2014 11:33:02 +0200
Subject: [PATCH] units: introduce network-pre.target as place to hook in
firewalls
network-pre.target is a passive target that should be pulled in by
services that want to be executed before any network is configured (for
example: firewall scrips).
network-pre.target should be ordered before all network managemet
services (but not be pulled in by them).
network-pre.target should be order after all services that want to be
executed before any network is configured (and be pulled in by them).
---
Makefile.am | 1 +
man/systemd.special.xml | 15 +++++++++++++++
units/local-fs.target | 2 --
units/network-pre.target | 12 ++++++++++++
units/network.target | 2 ++
units/systemd-networkd.service.in | 2 +-
6 files changed, 31 insertions(+), 3 deletions(-)
create mode 100644 units/network-pre.target
diff --git Makefile.am Makefile.am
index 3ea95e9..8514ec9 100644
--- Makefile.am
+++ Makefile.am
@@ -413,6 +413,7 @@ dist_systemunit_DATA = \
units/remote-fs.target \
units/remote-fs-pre.target \
units/network.target \
+ units/network-pre.target \
units/network-online.target \
units/nss-lookup.target \
units/nss-user-lookup.target \
diff --git man/systemd.special.xml man/systemd.special.xml
index 38b94a7..cda6edd 100644
--- man/systemd.special.xml
+++ man/systemd.special.xml
@@ -72,6 +72,7 @@
<filename>multi-user.target</filename>,
<filename>network.target</filename>,
<filename>network-online.target</filename>,
+ <filename>network-pre.target</filename>,
<filename>nss-lookup.target</filename>,
<filename>nss-user-lookup.target</filename>,
<filename>paths.target</filename>,
@@ -891,6 +892,20 @@
</listitem>
</varlistentry>
<varlistentry>
+ <term><filename>network-pre.target</filename></term>
+ <listitem>
+ <para>This passive target unit
+ may be pulled in by services
+ that want to run before any
+ network is set up, for example
+ for the purpose of setting up a
+ firewall. All network
+ management software orders
+ itself after this target, but
+ does not pull it in.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><filename>nss-lookup.target</filename></term>
<listitem>
<para>A target that should be
diff --git units/local-fs.target units/local-fs.target
index ae3cedc..70cb13f 100644
--- units/local-fs.target
+++ units/local-fs.target
@@ -9,7 +9,5 @@
Description=Local File Systems
Documentation=man:systemd.special(7)
After=local-fs-pre.target
-DefaultDependencies=no
-Conflicts=shutdown.target
OnFailure=emergency.target
OnFailureJobMode=replace-irreversibly
diff --git units/network-pre.target units/network-pre.target
new file mode 100644
index 0000000..0ea4bc7
--- /dev/null
+++ units/network-pre.target
@@ -0,0 +1,12 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=Network (Pre)
+Documentation=man:systemd.special(7)
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget
+RefuseManualStart=yes
diff --git units/network.target units/network.target
index 65fc64b..61ebdca 100644
--- units/network.target
+++ units/network.target
@@ -9,3 +9,5 @@
Description=Network
Documentation=man:systemd.special(7)
Documentation=http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget
+After=network-pre.target
+RefuseManualStart=yes
diff --git units/systemd-networkd.service.in units/systemd-networkd.service.in
index 373ac4e..48f4d63 100644
--- units/systemd-networkd.service.in
+++ units/systemd-networkd.service.in
@@ -9,7 +9,7 @@
Description=Network Service
Documentation=man:systemd-networkd.service(8)
DefaultDependencies=no
-After=dbus.service
+After=dbus.service network-pre.target
Before=network.target
Wants=network.target
ConditionCapability=CAP_NET_ADMIN
--
1.7.9.2

View File

@ -0,0 +1,25 @@
From 893e72da6b27c21b102e1589276e651e9e4f591c Mon Sep 17 00:00:00 2001
From: Michal Sekletar <msekleta@redhat.com>
Date: Tue, 9 Sep 2014 18:14:25 +0200
Subject: [PATCH] virt: detect that we are running inside the docker container
---
src/shared/virt.c | 2 ++
1 file changed, 2 insertions(+)
diff --git src/shared/virt.c src/shared/virt.c
index b436895..f9c4e67 100644
--- src/shared/virt.c
+++ src/shared/virt.c
@@ -310,6 +310,8 @@ int detect_container(const char **id) {
_id = "lxc-libvirt";
else if (streq(e, "systemd-nspawn"))
_id = "systemd-nspawn";
+ else if (streq(e, "docker"))
+ _id = "docker";
else
_id = "other";
--
1.7.9.2

View File

@ -0,0 +1,31 @@
From 1c92ff85b786c423f4436ec26007e79369c9ac05 Mon Sep 17 00:00:00 2001
From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Fri, 26 Sep 2014 22:01:32 +0200
Subject: [PATCH] bootchart: use 'n/a' if PRETTY_NAME is not found
Spotted with coverity. If parsing both /etc/os-release and
/usr/lib/os-release fails then null would be passed on. The calls
to parse the two files are allowed to fail. A empty /etc may not
have had the /etc/os-release symlink restored yet and we just
try again in the loop. If for whatever reason that does not happen
then we now pass on 'n/a' instead of null.
---
src/bootchart/bootchart.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git src/bootchart/bootchart.c src/bootchart/bootchart.c
index 366a5ab..813e38d 100644
--- src/bootchart/bootchart.c
+++ src/bootchart/bootchart.c
@@ -471,7 +471,7 @@ int main(int argc, char *argv[]) {
exit (EXIT_FAILURE);
}
- svg_do(build);
+ svg_do(strna(build));
fprintf(stderr, "systemd-bootchart wrote %s\n", output_file);
--
1.7.9.2

View File

@ -0,0 +1,25 @@
From 4e3deeedc15b03197d591850061316289245c9a9 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 7 Oct 2014 11:22:31 +0200
Subject: [PATCH] keymap: Fix touchpad toggle key on Asus laptops
https://launchpad.net/bugs/1377352
---
hwdb/60-keyboard.hwdb | 1 +
1 file changed, 1 insertion(+)
diff --git hwdb/60-keyboard.hwdb hwdb/60-keyboard.hwdb
index 1fea32a..59f467b 100644
--- hwdb/60-keyboard.hwdb
+++ hwdb/60-keyboard.hwdb
@@ -153,6 +153,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnASUS:pn*
keyboard:name:Asus WMI hotkeys:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:pvr*
keyboard:name:Eee PC WMI hotkeys:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:pvr*
+keyboard:name:Asus Laptop extra buttons:dmi:bvn*:bvr*:bd*:svnASUS*:pn*:pvr*
KEYBOARD_KEY_6b=f21 # Touchpad Toggle
###########################################################
--
1.7.9.2

View File

@ -0,0 +1,71 @@
From 492d7a3038b154e1813a1ece913a5a27148fec19 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Sat, 27 Sep 2014 09:55:44 +0200
Subject: [PATCH] logind: add support for TPS65217 Power Button
This PMIC is found on TI AM335x based boards like the beaglebone and
beaglebone black.
root@beaglebone-white:~# udevadm info -a /dev/input/event0
Udevadm info starts with the device specified by the devpath and then
walks up the chain of parent devices. It prints for every device
found, all possible attributes in the udev rules key format.
A rule to match, can be composed by the attributes of the device
and the attributes from one single parent device.
looking at device
'/devices/ocp.3/44e0b000.i2c/i2c-0/0-0024/input/input0/event0':
KERNEL=="event0"
SUBSYSTEM=="input"
DRIVER==""
looking at parent device
'/devices/ocp.3/44e0b000.i2c/i2c-0/0-0024/input/input0':
KERNELS=="input0"
SUBSYSTEMS=="input"
DRIVERS==""
ATTRS{name}=="tps65217_pwr_but"
ATTRS{phys}==""
ATTRS{uniq}==""
ATTRS{properties}=="0"
looking at parent device '/devices/ocp.3/44e0b000.i2c/i2c-0/0-0024':
KERNELS=="0-0024"
SUBSYSTEMS=="i2c"
DRIVERS=="tps65217"
ATTRS{name}=="tps65217"
looking at parent device '/devices/ocp.3/44e0b000.i2c/i2c-0':
KERNELS=="i2c-0"
SUBSYSTEMS=="i2c"
DRIVERS==""
ATTRS{name}=="OMAP I2C adapter"
looking at parent device '/devices/ocp.3/44e0b000.i2c':
KERNELS=="44e0b000.i2c"
SUBSYSTEMS=="platform"
DRIVERS=="omap_i2c"
looking at parent device '/devices/ocp.3':
KERNELS=="ocp.3"
SUBSYSTEMS=="platform"
DRIVERS==""
---
src/login/70-power-switch.rules | 1 +
1 file changed, 1 insertion(+)
diff --git src/login/70-power-switch.rules src/login/70-power-switch.rules
index a6997f7..695d246 100644
--- src/login/70-power-switch.rules
+++ src/login/70-power-switch.rules
@@ -10,5 +10,6 @@ ACTION=="remove", GOTO="power_switch_end"
SUBSYSTEM=="input", KERNEL=="event*", SUBSYSTEMS=="acpi", TAG+="power-switch"
SUBSYSTEM=="input", KERNEL=="event*", KERNELS=="thinkpad_acpi", TAG+="power-switch"
SUBSYSTEM=="input", KERNEL=="event*", ATTRS{name}=="twl4030_pwrbutton", TAG+="power-switch"
+SUBSYSTEM=="input", KERNEL=="event*", ATTRS{name}=="tps65217_pwr_but", TAG+="power-switch"
LABEL="power_switch_end"
--
1.7.9.2

View File

@ -0,0 +1,29 @@
From 24119cf10c7ed58a8fc0851745149dcc6dd5757f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Mon, 29 Sep 2014 22:32:10 -0400
Subject: [PATCH] udev/hwdb: New Entry for Dell XPS12 9Q33 keyboard
https://bugs.freedesktop.org/show_bug.cgi?id=84437
---
hwdb/60-keyboard.hwdb | 5 +++++
1 file changed, 5 insertions(+)
diff --git hwdb/60-keyboard.hwdb hwdb/60-keyboard.hwdb
index 0ffcb83..8a1baa7 100644
--- hwdb/60-keyboard.hwdb
+++ hwdb/60-keyboard.hwdb
@@ -243,6 +243,11 @@ keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnPrecision*:pvr*
keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnXPS*:pvr*
KEYBOARD_KEY_8c=!unknown
+# Dell XPS12 9Q33
+keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnXPS12-9Q33*:pvr*
+ KEYBOARD_KEY_88=wlan
+ KEYBOARD_KEY_65=switchvideomode # Screen Rotate
+
# Dell Latitude microphone mute
keyboard:name:Dell WMI hotkeys:dmi:bvn*:bvr*:bd*:svnDell*:pnLatitude*
KEYBOARD_KEY_150=f20 # Mic mute toggle, should be micmute
--
1.7.9.2

View File

@ -0,0 +1,34 @@
From 9bcf7507fab6e6b022ae3cc7178237e6e0a09e9a Mon Sep 17 00:00:00 2001
From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Fri, 26 Sep 2014 21:41:02 +0200
Subject: [PATCH] bootchart: parse userinput with safe_atoi
Found by coverity. Fixes: CID#996409
---
src/bootchart/store.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git src/bootchart/store.c src/bootchart/store.c
index ed683e8..3099ff1 100644
--- src/bootchart/store.c
+++ src/bootchart/store.c
@@ -192,12 +192,14 @@ vmstat_next:
m = buf;
while (m) {
+ int r;
+
if (sscanf(m, "%s %*s %*s %*s %*s %*s %*s %s %s", key, rt, wt) < 3)
goto schedstat_next;
if (strstr(key, "cpu")) {
- c = atoi((const char*)(key+3));
- if (c > MAXCPUS)
+ r = safe_atoi((const char*)(key+3), &c);
+ if (r < 0 || c > MAXCPUS)
/* Oops, we only have room for MAXCPUS data */
break;
sampledata->runtime[c] = atoll(rt);
--
1.7.9.2

View File

@ -0,0 +1,30 @@
Based on 754fc0c720eb998b8e47e695c12807ced0ff3602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 3 Oct 2014 08:58:40 -0400
Subject: [PATCH] fileio-label: return error when writing fails
The status of actually writing the file was totally ignored.
---
src/shared/fileio-label.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- src/shared/fileio-label.c
+++ src/shared/fileio-label.c 2014-10-14 14:52:50.883837740 +0000
@@ -33,7 +33,7 @@ int write_string_file_atomic_label(const
if (r < 0)
return r;
- write_string_file_atomic(fn, line);
+ r = write_string_file_atomic(fn, line);
label_context_clear();
@@ -47,7 +47,7 @@ int write_env_file_label(const char *fna
if (r < 0)
return r;
- write_env_file(fname, l);
+ r = write_env_file(fname, l);
label_context_clear();

View File

@ -0,0 +1,35 @@
From 8bf13eb1e02b9977ae1cd331ae5dc7305a305a09 Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@zonque.org>
Date: Tue, 7 Oct 2014 12:10:06 +0200
Subject: [PATCH] sd-bus: check return value of vasprintf
Check for OOM situations when vasprintf() returns < 0 in bus_error_setfv().
Spotted by coverity.
---
src/libsystemd/sd-bus/bus-error.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git src/libsystemd/sd-bus/bus-error.c src/libsystemd/sd-bus/bus-error.c
index abdfd73..5ca974a 100644
--- src/libsystemd/sd-bus/bus-error.c
+++ src/libsystemd/sd-bus/bus-error.c
@@ -194,8 +194,13 @@ int bus_error_setfv(sd_bus_error *e, const char *name, const char *format, va_li
return -ENOMEM;
}
- if (format)
- vasprintf((char**) &e->message, format, ap);
+ if (format) {
+ int r;
+
+ r = vasprintf((char**) &e->message, format, ap);
+ if (r < 0)
+ return -ENOMEM;
+ }
e->_need_free = 1;
--
1.7.9.2

View File

@ -0,0 +1,63 @@
From e931d3f4241231e4102eda06adaf7cbfd68c6a5d Mon Sep 17 00:00:00 2001
From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Sat, 27 Sep 2014 22:25:07 +0200
Subject: [PATCH] bootchart: check return of strftime
Found by coverity. Fixes: CID#996314 and #996312
---
src/bootchart/bootchart.c | 8 ++++++--
src/bootchart/svg.c | 5 +++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git src/bootchart/bootchart.c src/bootchart/bootchart.c
index 8ef5ad1..366a5ab 100644
--- src/bootchart/bootchart.c
+++ src/bootchart/bootchart.c
@@ -389,7 +389,9 @@ int main(int argc, char *argv[]) {
if (!of && (access(arg_output_path, R_OK|W_OK|X_OK) == 0)) {
t = time(NULL);
- strftime(datestr, sizeof(datestr), "%Y%m%d-%H%M", localtime(&t));
+ r = strftime(datestr, sizeof(datestr), "%Y%m%d-%H%M", localtime(&t));
+ assert_se(r > 0);
+
snprintf(output_file, PATH_MAX, "%s/bootchart-%s.svg", arg_output_path, datestr);
of = fopen(output_file, "we");
}
@@ -457,7 +459,9 @@ int main(int argc, char *argv[]) {
if (!of) {
t = time(NULL);
- strftime(datestr, sizeof(datestr), "%Y%m%d-%H%M", localtime(&t));
+ r = strftime(datestr, sizeof(datestr), "%Y%m%d-%H%M", localtime(&t));
+ assert_se(r > 0);
+
snprintf(output_file, PATH_MAX, "%s/bootchart-%s.svg", arg_output_path, datestr);
of = fopen(output_file, "we");
}
diff --git src/bootchart/svg.c src/bootchart/svg.c
index 135883f..faf377e 100644
--- src/bootchart/svg.c
+++ src/bootchart/svg.c
@@ -162,7 +162,7 @@ static void svg_title(const char *build) {
char *c;
FILE *f;
time_t t;
- int fd;
+ int fd, r;
struct utsname uts;
/* grab /proc/cmdline */
@@ -196,7 +196,8 @@ static void svg_title(const char *build) {
/* date */
t = time(NULL);
- strftime(date, sizeof(date), "%a, %d %b %Y %H:%M:%S %z", localtime(&t));
+ r = strftime(date, sizeof(date), "%a, %d %b %Y %H:%M:%S %z", localtime(&t));
+ assert_se(r > 0);
/* CPU type */
fd = openat(procfd, "cpuinfo", O_RDONLY);
--
1.7.9.2

View File

@ -0,0 +1,27 @@
From 5329ab10ffaf5b4a3fd6ebd9380b1ec09d05cfc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= <grawity@gmail.com>
Date: Tue, 7 Oct 2014 14:55:21 +0300
Subject: [PATCH] core: map the 'rescue' argument to rescue.target
Even though the 'emergency' and 'single' aliases come from sysvinit, the
lack of 'rescue' is still quite confusing (caught me by surprise for the
9th time yet) and inconsistent with `systemctl rescue` as well.
---
src/core/main.c | 1 +
1 file changed, 1 insertion(+)
diff --git src/core/main.c src/core/main.c
index 1a62e04..44373cc 100644
--- src/core/main.c
+++ src/core/main.c
@@ -272,6 +272,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
static const char * const rlmap[] = {
"emergency", SPECIAL_EMERGENCY_TARGET,
"-b", SPECIAL_EMERGENCY_TARGET,
+ "rescue", SPECIAL_RESCUE_TARGET,
"single", SPECIAL_RESCUE_TARGET,
"-s", SPECIAL_RESCUE_TARGET,
"s", SPECIAL_RESCUE_TARGET,
--
1.7.9.2

View File

@ -0,0 +1,46 @@
From 7057bd993110c1eff0cd3a8776902ca66417634e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 3 Oct 2014 18:49:45 -0400
Subject: [PATCH] sd-event: check the value of received signal
Appease coverity report #1237775.
Also rename ss to n, to make it visually different from ss.
---
src/libsystemd/sd-event/sd-event.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git src/libsystemd/sd-event/sd-event.c src/libsystemd/sd-event/sd-event.c
index b56182d..4c67ee8 100644
--- src/libsystemd/sd-event/sd-event.c
+++ src/libsystemd/sd-event/sd-event.c
@@ -1973,20 +1973,22 @@ static int process_signal(sd_event *e, uint32_t events) {
for (;;) {
struct signalfd_siginfo si;
- ssize_t ss;
+ ssize_t n;
sd_event_source *s = NULL;
- ss = read(e->signal_fd, &si, sizeof(si));
- if (ss < 0) {
+ n = read(e->signal_fd, &si, sizeof(si));
+ if (n < 0) {
if (errno == EAGAIN || errno == EINTR)
return read_one;
return -errno;
}
- if (_unlikely_(ss != sizeof(si)))
+ if (_unlikely_(n != sizeof(si)))
return -EIO;
+ assert(si.ssi_signo < _NSIG);
+
read_one = true;
if (si.ssi_signo == SIGCHLD) {
--
1.7.9.2

View File

@ -0,0 +1,29 @@
From c119700c06b248b1c2a082b40b1a346f58d89da0 Mon Sep 17 00:00:00 2001
From: Philippe De Swert <philippe.deswert@jollamobile.com>
Date: Sun, 28 Sep 2014 18:12:51 +0300
Subject: [PATCH] bootchart: Do not try to access data for non-existing CPU's
Cpu's are assigned normally, so starting at 0, so the MAX_CPU index will
always be one smaller than the actual number.
Found with Coverity.
---
src/bootchart/store.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git src/bootchart/store.c src/bootchart/store.c
index 3099ff1..9ea1b27 100644
--- src/bootchart/store.c
+++ src/bootchart/store.c
@@ -199,7 +199,7 @@ vmstat_next:
if (strstr(key, "cpu")) {
r = safe_atoi((const char*)(key+3), &c);
- if (r < 0 || c > MAXCPUS)
+ if (r < 0 || c > MAXCPUS -1)
/* Oops, we only have room for MAXCPUS data */
break;
sampledata->runtime[c] = atoll(rt);
--
1.7.9.2

View File

@ -0,0 +1,37 @@
From cef3566998fcae6936d781e678c309950a8a5787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 3 Oct 2014 20:57:30 -0400
Subject: [PATCH] sd-id128: do stricter checking of random boot id
If we are bothering to check whether the kernel is not feeding us
bad data, we might as well do it properly.
CID #1237692.
---
src/libsystemd/sd-id128/sd-id128.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git src/libsystemd/sd-id128/sd-id128.c src/libsystemd/sd-id128/sd-id128.c
index a1e44e6..233ffa0 100644
--- src/libsystemd/sd-id128/sd-id128.c
+++ src/libsystemd/sd-id128/sd-id128.c
@@ -183,11 +183,14 @@ _public_ int sd_id128_get_boot(sd_id128_t *ret) {
for (j = 0, p = buf; j < 16; j++) {
int a, b;
- if (p >= buf + k)
+ if (p >= buf + k - 1)
return -EIO;
- if (*p == '-')
+ if (*p == '-') {
p++;
+ if (p >= buf + k - 1)
+ return -EIO;
+ }
a = unhexchar(p[0]);
b = unhexchar(p[1]);
--
1.7.9.2

View File

@ -0,0 +1,26 @@
Based on 6f53e671aa7539cab02c9f739d84d28a343ca5bc Mon Sep 17 00:00:00 2001
From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Wed, 8 Oct 2014 23:57:32 +0200
Subject: [PATCH] util: avoid double close of fd
We could end with a double close if we close the fd loop and flush_fd
fails. That would make us goto fail and there we close the fd once
again. This patch sets the fd to the return value for safe_close: -1
A fd with negative value will be ignored by the next call to
safe_close.
CID#996223
---
src/shared/util.c | 1 +
1 file changed, 1 insertion(+)
--- src/shared/util.c
+++ src/shared/util.c 2014-10-14 15:42:22.515839157 +0000
@@ -1969,6 +1969,7 @@ int acquire_terminal(
* we do this after sleeping, so that we don't enter
* an endless loop. */
close_nointr_nofail(fd);
+ fd = -1;
}
if (notify >= 0)

View File

@ -0,0 +1,38 @@
From 2e3390ea4684b954edce66b7758b5371d3338a9f Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Thu, 2 Oct 2014 07:53:15 +0200
Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
---
hwdb/20-bluetooth-vendor-product.hwdb | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git hwdb/20-bluetooth-vendor-product.hwdb hwdb/20-bluetooth-vendor-product.hwdb
index 14aee74..ee2efdf 100644
--- hwdb/20-bluetooth-vendor-product.hwdb
+++ hwdb/20-bluetooth-vendor-product.hwdb
@@ -1148,3 +1148,21 @@ bluetooth:v017B*
bluetooth:v017C*
ID_VENDOR_FROM_DATABASE=Daimler AG
+
+bluetooth:v017D*
+ ID_VENDOR_FROM_DATABASE=BatAndCat
+
+bluetooth:v017E*
+ ID_VENDOR_FROM_DATABASE=BluDotz Ltd
+
+bluetooth:v017F*
+ ID_VENDOR_FROM_DATABASE=XTel ApS
+
+bluetooth:v0180*
+ ID_VENDOR_FROM_DATABASE=Gigaset Communications GmbH
+
+bluetooth:v0181*
+ ID_VENDOR_FROM_DATABASE=Gecko Health Innovations, Inc.
+
+bluetooth:v0182*
+ ID_VENDOR_FROM_DATABASE=HOP Ubiquitous
--
1.7.9.2

View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Tue Oct 14 14:16:52 UTC 2014 - werner@suse.de
- Add upstream patches
0001-journalctl-do-not-output-reboot-markers-when-running.patch
0002-udev-hwdb-New-Entry-for-Dell-XPS12-9Q33-keyboard.patch
-------------------------------------------------------------------
Tue Oct 14 13:58:45 UTC 2014 - werner@suse.de
- Add upstream patches
0001-logind-add-support-for-Triton2-Power-Button.patch
0002-logind-add-support-for-TPS65217-Power-Button.patch
- Add upstream patches
0001-shutdownd-clean-up-initialization-of-struct.patch
0003-bootchart-parse-userinput-with-safe_atoi.patch
0004-bootchart-check-return-of-strftime.patch
0005-bootchart-Do-not-try-to-access-data-for-non-existing.patch
-------------------------------------------------------------------
Thu Oct 2 07:21:42 PDT 2014 - lduncan@suse.com
- Revert patch 1063, which incorrectly disallows
/dev/disk/by-path links for iSCSI (and other)
devices. Will be corrected and re-added once
upstream is consulted. (bnc#898233). Disable:
1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patc
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 26 16:11:10 UTC 2014 - werner@suse.de Fri Sep 26 16:11:10 UTC 2014 - werner@suse.de

View File

@ -902,6 +902,22 @@ Patch435: 0001-Fix-warning-about-unused-variable-with-SELINUX.patch
Patch436: 0002-bus-remove-unused-check.patch Patch436: 0002-bus-remove-unused-check.patch
# PATCH-FIX-UPSTREAM added at 2014/09/26 # PATCH-FIX-UPSTREAM added at 2014/09/26
Patch437: 0001-systemd-tmpfiles-Fix-IGNORE_DIRECTORY_PATH-age-handl.patch Patch437: 0001-systemd-tmpfiles-Fix-IGNORE_DIRECTORY_PATH-age-handl.patch
# PATCH-FIX-UPSTREAM added at 2014/09/29
Patch438: 0001-logind-add-support-for-Triton2-Power-Button.patch
# PATCH-FIX-UPSTREAM added at 2014/09/29
Patch439: 0002-logind-add-support-for-TPS65217-Power-Button.patch
# PATCH-FIX-UPSTREAM added at 2014/09/29
Patch440: 0001-shutdownd-clean-up-initialization-of-struct.patch
# PATCH-FIX-UPSTREAM added at 2014/09/29
Patch441: 0003-bootchart-parse-userinput-with-safe_atoi.patch
# PATCH-FIX-UPSTREAM added at 2014/09/29
Patch442: 0004-bootchart-check-return-of-strftime.patch
# PATCH-FIX-UPSTREAM added at 2014/09/29
Patch443: 0005-bootchart-Do-not-try-to-access-data-for-non-existing.patch
# PATCH-FIX-UPSTREAM added at 2014/10/02
Patch444: 0001-journalctl-do-not-output-reboot-markers-when-running.patch
# PATCH-FIX-UPSTREAM added at 2014/10/02
Patch445: 0002-udev-hwdb-New-Entry-for-Dell-XPS12-9Q33-keyboard.patch
# UDEV PATCHES # UDEV PATCHES
# ============ # ============
@ -1034,7 +1050,7 @@ Patch1061: 1061-rules-allow-systemd-to-manage-loop-device-partitions.patch
# PATCH-FIX-SUSE 1062-rules-set-default-permissions-for-GenWQE-devices.patch (bnc#890977) # PATCH-FIX-SUSE 1062-rules-set-default-permissions-for-GenWQE-devices.patch (bnc#890977)
Patch1062: 1062-rules-set-default-permissions-for-GenWQE-devices.patch Patch1062: 1062-rules-set-default-permissions-for-GenWQE-devices.patch
# PATCH-FIX-UPSTREAM 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch # PATCH-FIX-UPSTREAM 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch
Patch1063: 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch #Patch1063: 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch
# PATCH-FIX-UPSTREAM 1064-udev-hwdb-do-not-look-at-usb_device-parents.patch # PATCH-FIX-UPSTREAM 1064-udev-hwdb-do-not-look-at-usb_device-parents.patch
Patch1064: 1064-udev-hwdb-do-not-look-at-usb_device-parents.patch Patch1064: 1064-udev-hwdb-do-not-look-at-usb_device-parents.patch
# PATCH-FIX-UPSTREAM 1065-udev-bump-event-timeout-to-60-seconds.patch # PATCH-FIX-UPSTREAM 1065-udev-bump-event-timeout-to-60-seconds.patch
@ -1683,6 +1699,14 @@ cp %{SOURCE7} m4/
%patch435 -p0 %patch435 -p0
%patch436 -p0 %patch436 -p0
%patch437 -p0 %patch437 -p0
%patch438 -p0
%patch439 -p0
%patch440 -p0
%patch441 -p0
%patch442 -p0
%patch443 -p0
%patch444 -p0
%patch445 -p0
# udev patches # udev patches
%patch1001 -p1 %patch1001 -p1
@ -1768,7 +1792,6 @@ cp %{SOURCE7} m4/
%patch1060 -p1 %patch1060 -p1
%patch1061 -p0 %patch1061 -p0
%patch1062 -p1 %patch1062 -p1
%patch1063 -p0
%patch1064 -p0 %patch1064 -p0
%patch1065 -p0 %patch1065 -p0
%patch1066 -p1 %patch1066 -p1

View File

@ -1,3 +1,67 @@
-------------------------------------------------------------------
Tue Oct 14 16:23:51 UTC 2014 - werner@suse.de
- Add upstream patches
0001-systemctl-when-mangle-unit-names-for-the-isolate-suf.patch
0001-tmpfiles-compare-return-against-correct-errno.patch
-------------------------------------------------------------------
Tue Oct 14 16:19:42 UTC 2014 - werner@suse.de
- Add upstream patches
0001-units-introduce-network-pre.target-as-place-to-hook-.patch
0001-keymap-Fix-touchpad-toggle-on-Toshiba-Satellite-P75-.patch
0002-keymap-Fix-touchpad-toggle-key-on-Asus-laptops.patch
0003-sd-bus-check-return-value-of-vasprintf.patch
0004-core-map-the-rescue-argument-to-rescue.target.patch
0005-util-avoid-double-close-of-fd.patch
-------------------------------------------------------------------
Tue Oct 14 16:18:36 UTC 2014 - werner@suse.de
- Add upstream patches
0001-sd-event-don-t-require-a-signal-event-source-to-be-e.patch
0001-virt-detect-that-we-are-running-inside-the-docker-co.patch
0002-bootchart-use-n-a-if-PRETTY_NAME-is-not-found.patch
0003-fileio-label-return-error-when-writing-fails.patch
0004-sd-event-check-the-value-of-received-signal.patch
0005-sd-id128-do-stricter-checking-of-random-boot-id.patch
-------------------------------------------------------------------
Tue Oct 14 14:46:58 UTC 2014 - werner@suse.de
- Add upstream patches
0001-core-swap-only-make-configured-units-part-of-swap.ta.patch
0009-hwdb-Update-database-of-Bluetooth-company-identifier.patch
-------------------------------------------------------------------
Tue Oct 14 14:16:52 UTC 2014 - werner@suse.de
- Add upstream patches
0001-journalctl-do-not-output-reboot-markers-when-running.patch
0002-udev-hwdb-New-Entry-for-Dell-XPS12-9Q33-keyboard.patch
-------------------------------------------------------------------
Tue Oct 14 13:58:45 UTC 2014 - werner@suse.de
- Add upstream patches
0001-logind-add-support-for-Triton2-Power-Button.patch
0002-logind-add-support-for-TPS65217-Power-Button.patch
- Add upstream patches
0001-shutdownd-clean-up-initialization-of-struct.patch
0003-bootchart-parse-userinput-with-safe_atoi.patch
0004-bootchart-check-return-of-strftime.patch
0005-bootchart-Do-not-try-to-access-data-for-non-existing.patch
-------------------------------------------------------------------
Thu Oct 2 07:21:42 PDT 2014 - lduncan@suse.com
- Revert patch 1063, which incorrectly disallows
/dev/disk/by-path links for iSCSI (and other)
devices. Will be corrected and re-added once
upstream is consulted. (bnc#898233). Disable:
1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patc
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 26 16:11:10 UTC 2014 - werner@suse.de Fri Sep 26 16:11:10 UTC 2014 - werner@suse.de

View File

@ -897,6 +897,54 @@ Patch435: 0001-Fix-warning-about-unused-variable-with-SELINUX.patch
Patch436: 0002-bus-remove-unused-check.patch Patch436: 0002-bus-remove-unused-check.patch
# PATCH-FIX-UPSTREAM added at 2014/09/26 # PATCH-FIX-UPSTREAM added at 2014/09/26
Patch437: 0001-systemd-tmpfiles-Fix-IGNORE_DIRECTORY_PATH-age-handl.patch Patch437: 0001-systemd-tmpfiles-Fix-IGNORE_DIRECTORY_PATH-age-handl.patch
# PATCH-FIX-UPSTREAM added at 2014/09/29
Patch438: 0001-logind-add-support-for-Triton2-Power-Button.patch
# PATCH-FIX-UPSTREAM added at 2014/09/29
Patch439: 0002-logind-add-support-for-TPS65217-Power-Button.patch
# PATCH-FIX-UPSTREAM added at 2014/09/29
Patch440: 0001-shutdownd-clean-up-initialization-of-struct.patch
# PATCH-FIX-UPSTREAM added at 2014/09/29
Patch441: 0003-bootchart-parse-userinput-with-safe_atoi.patch
# PATCH-FIX-UPSTREAM added at 2014/09/29
Patch442: 0004-bootchart-check-return-of-strftime.patch
# PATCH-FIX-UPSTREAM added at 2014/09/29
Patch443: 0005-bootchart-Do-not-try-to-access-data-for-non-existing.patch
# PATCH-FIX-UPSTREAM added at 2014/09/30
Patch444: 0001-journalctl-do-not-output-reboot-markers-when-running.patch
# PATCH-FIX-UPSTREAM added at 2014/09/30
Patch445: 0002-udev-hwdb-New-Entry-for-Dell-XPS12-9Q33-keyboard.patch
# PATCH-FIX-UPSTREAM added at 2014/10/02
Patch446: 0001-core-swap-only-make-configured-units-part-of-swap.ta.patch
# PATCH-FIX-UPSTREAM added at 2014/10/02
Patch447: 0009-hwdb-Update-database-of-Bluetooth-company-identifier.patch
# PATCH-FIX-UPSTREAM added at 2014/10/07
Patch448: 0001-virt-detect-that-we-are-running-inside-the-docker-co.patch
# PATCH-FIX-UPSTREAM added at 2014/10/07
Patch449: 0002-bootchart-use-n-a-if-PRETTY_NAME-is-not-found.patch
# PATCH-FIX-UPSTREAM added at 2014/10/07
Patch450: 0003-fileio-label-return-error-when-writing-fails.patch
# PATCH-FIX-UPSTREAM added at 2014/10/07
Patch451: 0001-sd-event-don-t-require-a-signal-event-source-to-be-e.patch
# PATCH-FIX-UPSTREAM added at 2014/10/07
Patch452: 0004-sd-event-check-the-value-of-received-signal.patch
# PATCH-FIX-UPSTREAM added at 2014/10/07
Patch453: 0005-sd-id128-do-stricter-checking-of-random-boot-id.patch
# PATCH-FIX-UPSTREAM added at 2014/10/10
Patch454: 0001-keymap-Fix-touchpad-toggle-on-Toshiba-Satellite-P75-.patch
# PATCH-FIX-UPSTREAM added at 2014/10/10
Patch455: 0001-units-introduce-network-pre.target-as-place-to-hook-.patch
# PATCH-FIX-UPSTREAM added at 2014/10/10
Patch456: 0002-keymap-Fix-touchpad-toggle-key-on-Asus-laptops.patch
# PATCH-FIX-UPSTREAM added at 2014/10/10
Patch457: 0003-sd-bus-check-return-value-of-vasprintf.patch
# PATCH-FIX-UPSTREAM added at 2014/10/10
Patch458: 0004-core-map-the-rescue-argument-to-rescue.target.patch
# PATCH-FIX-UPSTREAM added at 2014/10/10
Patch459: 0005-util-avoid-double-close-of-fd.patch
# PATCH-FIX-UPSTREAM added at 2014/10/13
Patch460: 0001-systemctl-when-mangle-unit-names-for-the-isolate-suf.patch
# PATCH-FIX-UPSTREAM added at 2014/10/14
Patch461: 0001-tmpfiles-compare-return-against-correct-errno.patch
# UDEV PATCHES # UDEV PATCHES
# ============ # ============
@ -1029,7 +1077,7 @@ Patch1061: 1061-rules-allow-systemd-to-manage-loop-device-partitions.patch
# PATCH-FIX-SUSE 1062-rules-set-default-permissions-for-GenWQE-devices.patch (bnc#890977) # PATCH-FIX-SUSE 1062-rules-set-default-permissions-for-GenWQE-devices.patch (bnc#890977)
Patch1062: 1062-rules-set-default-permissions-for-GenWQE-devices.patch Patch1062: 1062-rules-set-default-permissions-for-GenWQE-devices.patch
# PATCH-FIX-UPSTREAM 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch # PATCH-FIX-UPSTREAM 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch
Patch1063: 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch #Patch1063: 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch
# PATCH-FIX-UPSTREAM 1064-udev-hwdb-do-not-look-at-usb_device-parents.patch # PATCH-FIX-UPSTREAM 1064-udev-hwdb-do-not-look-at-usb_device-parents.patch
Patch1064: 1064-udev-hwdb-do-not-look-at-usb_device-parents.patch Patch1064: 1064-udev-hwdb-do-not-look-at-usb_device-parents.patch
# PATCH-FIX-UPSTREAM 1065-udev-bump-event-timeout-to-60-seconds.patch # PATCH-FIX-UPSTREAM 1065-udev-bump-event-timeout-to-60-seconds.patch
@ -1678,6 +1726,30 @@ cp %{SOURCE7} m4/
%patch435 -p0 %patch435 -p0
%patch436 -p0 %patch436 -p0
%patch437 -p0 %patch437 -p0
%patch438 -p0
%patch439 -p0
%patch440 -p0
%patch441 -p0
%patch442 -p0
%patch443 -p0
%patch444 -p0
%patch445 -p0
%patch446 -p0
%patch447 -p0
%patch448 -p0
%patch449 -p0
%patch450 -p0
%patch451 -p0
%patch452 -p0
%patch453 -p0
%patch454 -p0
%patch455 -p0
%patch456 -p0
%patch457 -p0
%patch458 -p0
%patch459 -p0
%patch460 -p0
%patch461 -p0
# udev patches # udev patches
%patch1001 -p1 %patch1001 -p1
@ -1763,7 +1835,6 @@ cp %{SOURCE7} m4/
%patch1060 -p1 %patch1060 -p1
%patch1061 -p0 %patch1061 -p0
%patch1062 -p1 %patch1062 -p1
%patch1063 -p0
%patch1064 -p0 %patch1064 -p0
%patch1065 -p0 %patch1065 -p0
%patch1066 -p1 %patch1066 -p1