SHA256
1
0
forked from pool/systemd

Accepting request 180972 from home:rmilasan:branches:Base:System

- Re-add fixed udev MSFT compability rules (bnc#805059, bnc#826528).
  add: 1008-add-msft-compability-rules.patch

- Re-add fixed udev MSFT compability rules (bnc#805059, bnc#826528).
  add: 1008-add-msft-compability-rules.patch

OBS-URL: https://build.opensuse.org/request/show/180972
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=407
This commit is contained in:
Robert Milasan 2013-06-26 09:33:43 +00:00 committed by Git OBS Bridge
parent 9843603afb
commit 34bcb72b45
5 changed files with 47 additions and 0 deletions

View File

@ -0,0 +1,29 @@
Index: systemd-204/Makefile.am
===================================================================
--- systemd-204.orig/Makefile.am
+++ systemd-204/Makefile.am
@@ -2242,6 +2242,10 @@ dist_udevrules_DATA += \
rules/80-hotplug-cpu-mem.rules
# ------------------------------------------------------------------------------
+dist_udevrules_DATA += \
+ rules/61-msft.rules
+
+# ------------------------------------------------------------------------------
if ENABLE_GUDEV
if ENABLE_GTK_DOC
SUBDIRS += \
Index: systemd-204/rules/61-msft.rules
===================================================================
--- /dev/null
+++ systemd-204/rules/61-msft.rules
@@ -0,0 +1,9 @@
+# MSFT compability rules
+ACTION!="add|change", GOTO="msft_end"
+
+ENV{DEVTYPE}=="partition", IMPORT{parent}="SCSI_IDENT_*"
+KERNEL=="sd*[!0-9]|sr*", ENV{SCSI_IDENT_LUN_T10}!="?*", IMPORT{program}="/usr/bin/sg_inq -p di --export $tempnode"
+KERNEL=="sd*|sr*", ENV{DEVTYPE}=="disk", ENV{SCSI_IDENT_LUN_T10}=="?*", SYMLINK+="disk/by-id/scsi-1$env{SCSI_IDENT_LUN_T10}"
+KERNEL=="sd*", ENV{DEVTYPE}=="partition", ENV{SCSI_IDENT_LUN_T10}=="?*", SYMLINK+="disk/by-id/scsi-1$env{SCSI_IDENT_LUN_T10}-part%n"
+
+LABEL="msft_end"

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 26 09:31:14 UTC 2013 - rmilasan@suse.com
- Re-add fixed udev MSFT compability rules (bnc#805059, bnc#826528).
add: 1008-add-msft-compability-rules.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 26 08:51:29 UTC 2013 - rmilasan@suse.com Wed Jun 26 08:51:29 UTC 2013 - rmilasan@suse.com

View File

@ -201,6 +201,8 @@ Patch1005: 1005-create-default-links-for-primary-cd_dvd-drive.patch
Patch1006: 1006-udev-always-rename-network.patch Patch1006: 1006-udev-always-rename-network.patch
# PATCH-FIX-OPENSUSE 1007-physical-hotplug-cpu-and-memory.patch # PATCH-FIX-OPENSUSE 1007-physical-hotplug-cpu-and-memory.patch
Patch1007: 1007-physical-hotplug-cpu-and-memory.patch Patch1007: 1007-physical-hotplug-cpu-and-memory.patch
# PATCH-FIX-OPENSUSE 1008-add-msft-compability-rules.patch
Patch1008: 1008-add-msft-compability-rules.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
@ -435,6 +437,7 @@ cp %{SOURCE7} m4/
# don't apply when bootstrapping to not modify Makefile.am # don't apply when bootstrapping to not modify Makefile.am
%if ! 0%{?bootstrap} %if ! 0%{?bootstrap}
%patch1007 -p1 %patch1007 -p1
%patch1008 -p1
%endif %endif
%build %build

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 26 09:31:14 UTC 2013 - rmilasan@suse.com
- Re-add fixed udev MSFT compability rules (bnc#805059, bnc#826528).
add: 1008-add-msft-compability-rules.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 26 08:51:29 UTC 2013 - rmilasan@suse.com Wed Jun 26 08:51:29 UTC 2013 - rmilasan@suse.com

View File

@ -196,6 +196,8 @@ Patch1005: 1005-create-default-links-for-primary-cd_dvd-drive.patch
Patch1006: 1006-udev-always-rename-network.patch Patch1006: 1006-udev-always-rename-network.patch
# PATCH-FIX-OPENSUSE 1007-physical-hotplug-cpu-and-memory.patch # PATCH-FIX-OPENSUSE 1007-physical-hotplug-cpu-and-memory.patch
Patch1007: 1007-physical-hotplug-cpu-and-memory.patch Patch1007: 1007-physical-hotplug-cpu-and-memory.patch
# PATCH-FIX-OPENSUSE 1008-add-msft-compability-rules.patch
Patch1008: 1008-add-msft-compability-rules.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
@ -430,6 +432,7 @@ cp %{SOURCE7} m4/
# don't apply when bootstrapping to not modify Makefile.am # don't apply when bootstrapping to not modify Makefile.am
%if ! 0%{?bootstrap} %if ! 0%{?bootstrap}
%patch1007 -p1 %patch1007 -p1
%patch1008 -p1
%endif %endif
%build %build