dirkmueller/systemd
SHA256
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Readd patch 1022 and add 1037-udev-exclude-cd-dvd-from-block-device.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=678
This commit is contained in:
Dr. Werner Fink 2014-06-18 13:10:45 +00:00 committed by Git OBS Bridge
parent 7bfdacc396
commit 9b4c897930
6 changed files with 1485 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1445
1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch Normal file
View File

File diff suppressed because it is too large Load Diff

14
1037-udev-exclude-cd-dvd-from-block-device.patch Normal file
View File

@ -0,0 +1,14 @@
Exclude cd/dvd as well (bnc#882714)
--- systemd-210/src/udev/udevd.c
+++ systemd-210/src/udev/udevd.c 2014-06-18 12:53:34.454235577 +0000
@@ -744,7 +744,8 @@ static int synthesize_change(struct udev
if (streq_ptr("block", udev_device_get_subsystem(dev)) &&
streq_ptr("disk", udev_device_get_devtype(dev)) &&
- !startswith(udev_device_get_sysname(dev), "dm-")) {
+ !startswith(udev_device_get_sysname(dev), "dm-") &&
+ !startswith(udev_device_get_sysname(dev), "sr")) {
bool part_table_read = false;
bool has_partitions = false;
int fd;

8
systemd-mini.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Jun 18 12:58:42 UTC 2014 - werner@suse.de
- Do not generate synthesize change for cd/dvd (bnc#882714, comment #51)
add patch 1037-udev-exclude-cd-dvd-from-block-device.patch from
Roberts suggestion as well as readd
1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 17 14:21:56 UTC 2014 - werner@suse.de Tue Jun 17 14:21:56 UTC 2014 - werner@suse.de

9
systemd-mini.spec
View File

@ -614,8 +614,7 @@ Patch1020: 1020-udev-keyboard-also-hook-into-change-events.patch
# PATCH-FIX-SUSE 1021-udev-re-add-persistent-net-rules.patch # PATCH-FIX-SUSE 1021-udev-re-add-persistent-net-rules.patch
Patch1021: 1021-udev-re-add-persistent-net-rules.patch Patch1021: 1021-udev-re-add-persistent-net-rules.patch
# PATCH-FIX-UPSTREAM 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch # PATCH-FIX-UPSTREAM 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch
# disable due to bnc#882714 Patch1022: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch
# Patch1022: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch
# PATCH-FIX-UPSTREAM added at 2014/06/03 # PATCH-FIX-UPSTREAM added at 2014/06/03
Patch1023: 1023-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch Patch1023: 1023-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch
# PATCH-FIX-UPSTREAM added at 2014/06/03 # PATCH-FIX-UPSTREAM added at 2014/06/03
@ -644,6 +643,8 @@ Patch1034: 1034-udev-check-the-return-value-from-udev_enumerate_scan.patch
Patch1035: 1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch Patch1035: 1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch
# PATCH-FIX-SUSE 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch # PATCH-FIX-SUSE 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch
Patch1036: 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch Patch1036: 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch
# PATCH-FIX-SUSE See bnc#882714 comment #51
Patch1037: 1037-udev-exclude-cd-dvd-from-block-device.patch
%description %description
Systemd is a system and service manager, compatible with SysV and LSB Systemd is a system and service manager, compatible with SysV and LSB
@ -1106,8 +1107,7 @@ cp %{SOURCE7} m4/
%patch1019 -p0 %patch1019 -p0
%patch1020 -p0 %patch1020 -p0
%patch1021 -p1 %patch1021 -p1
# disable due to bnc#882714 %patch1022 -p1
# %patch1022 -p1
%patch1023 -p0 %patch1023 -p0
%patch1024 -p0 %patch1024 -p0
%patch1025 -p1 %patch1025 -p1
@ -1122,6 +1122,7 @@ cp %{SOURCE7} m4/
%patch1034 -p1 %patch1034 -p1
%patch1035 -p1 %patch1035 -p1
%patch1036 -p1 %patch1036 -p1
%patch1037 -p1
# ensure generate files are removed # ensure generate files are removed
rm -f units/emergency.service rm -f units/emergency.service

8
systemd.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Jun 18 12:58:42 UTC 2014 - werner@suse.de
- Do not generate synthesize change for cd/dvd (bnc#882714, comment #51)
add patch 1037-udev-exclude-cd-dvd-from-block-device.patch from
Roberts suggestion as well as readd
1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 17 14:21:56 UTC 2014 - werner@suse.de Tue Jun 17 14:21:56 UTC 2014 - werner@suse.de

9
systemd.spec
View File

@ -609,8 +609,7 @@ Patch1020: 1020-udev-keyboard-also-hook-into-change-events.patch
# PATCH-FIX-SUSE 1021-udev-re-add-persistent-net-rules.patch # PATCH-FIX-SUSE 1021-udev-re-add-persistent-net-rules.patch
Patch1021: 1021-udev-re-add-persistent-net-rules.patch Patch1021: 1021-udev-re-add-persistent-net-rules.patch
# PATCH-FIX-UPSTREAM 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch # PATCH-FIX-UPSTREAM 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch
# disable due to bnc#882714 Patch1022: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch
# Patch1022: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch
# PATCH-FIX-UPSTREAM added at 2014/06/03 # PATCH-FIX-UPSTREAM added at 2014/06/03
Patch1023: 1023-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch Patch1023: 1023-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch
# PATCH-FIX-UPSTREAM added at 2014/06/03 # PATCH-FIX-UPSTREAM added at 2014/06/03
@ -639,6 +638,8 @@ Patch1034: 1034-udev-check-the-return-value-from-udev_enumerate_scan.patch
Patch1035: 1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch Patch1035: 1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch
# PATCH-FIX-SUSE 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch # PATCH-FIX-SUSE 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch
Patch1036: 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch Patch1036: 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch
# PATCH-FIX-SUSE See bnc#882714 comment #51
Patch1037: 1037-udev-exclude-cd-dvd-from-block-device.patch
%description %description
Systemd is a system and service manager, compatible with SysV and LSB Systemd is a system and service manager, compatible with SysV and LSB
@ -1101,8 +1102,7 @@ cp %{SOURCE7} m4/
%patch1019 -p0 %patch1019 -p0
%patch1020 -p0 %patch1020 -p0
%patch1021 -p1 %patch1021 -p1
# disable due to bnc#882714 %patch1022 -p1
# %patch1022 -p1
%patch1023 -p0 %patch1023 -p0
%patch1024 -p0 %patch1024 -p0
%patch1025 -p1 %patch1025 -p1
@ -1117,6 +1117,7 @@ cp %{SOURCE7} m4/
%patch1034 -p1 %patch1034 -p1
%patch1035 -p1 %patch1035 -p1
%patch1036 -p1 %patch1036 -p1
%patch1037 -p1
# ensure generate files are removed # ensure generate files are removed
rm -f units/emergency.service rm -f units/emergency.service