systemd/1007-add-msft-compability-rules.patch
Robert Milasan 0201053d5c Accepting request 178519 from home:rmilasan:branches:Base:System
- Add udev MSFT compability rules (bnc#805059).
  add: 1007-add-msft-compability-rules.patch
- Add sg3_utils requires, need it by 61-msft.rules (bnc#805059).
- Clean-up spec file, put udev patches after systemd patches.
- Rebase patches so they would apply nicely.

- Add udev MSFT compability rules (bnc#805059).
  add: 1007-add-msft-compability-rules.patch
- Add sg3_utils requires, need it by 61-msft.rules (bnc#805059).
- Clean-up spec file, put udev patches after systemd patches.
- Rebase patches so they would apply nicely.

OBS-URL: https://build.opensuse.org/request/show/178519
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=391
2013-06-11 11:22:32 +00:00

51 lines
2.3 KiB
Diff

Index: systemd-204/Makefile.am
===================================================================
--- systemd-204.orig/Makefile.am
+++ systemd-204/Makefile.am
@@ -2238,6 +2238,10 @@ dist_udevrules_DATA += \
rules/73-seat-numlock.rules
# ------------------------------------------------------------------------------
+dist_udevrules_DATA += \
+ rules/61-msft.rules
+
+# ------------------------------------------------------------------------------
if ENABLE_GUDEV
if ENABLE_GTK_DOC
SUBDIRS += \
Index: systemd-204/Makefile.in
===================================================================
--- systemd-204.orig/Makefile.in
+++ systemd-204/Makefile.in
@@ -2609,6 +2609,7 @@ am__dist_udevrules_DATA_DIST = rules/99-
rules/95-udev-late.rules rules/50-firmware.rules \
rules/80-drivers.rules rules/60-cdrom_id.rules \
rules/60-persistent-v4l.rules rules/61-accelerometer.rules \
+ rules/61-msft.rules \
src/udev/keymap/95-keymap.rules \
src/udev/keymap/95-keyboard-force-release.rules \
rules/75-probe_mtd.rules src/login/70-uaccess.rules \
@@ -3341,7 +3342,7 @@ dist_udevrules_DATA = rules/99-systemd.r
rules/78-sound-card.rules rules/80-net-name-slot.rules \
rules/95-udev-late.rules $(am__append_53) $(am__append_55) \
rules/60-cdrom_id.rules rules/60-persistent-v4l.rules \
- rules/61-accelerometer.rules $(am__append_71) \
+ rules/61-accelerometer.rules rules/61-msft.rules $(am__append_71) \
rules/75-probe_mtd.rules $(am__append_173)
nodist_udevrules_DATA = $(am__append_174)
dist_pkgsysconf_DATA = src/core/system.conf src/core/user.conf \
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", ENV{ID_BUS}="scsi"
+KERNEL=="sd*|sr*", ENV{DEVTYPE}=="disk", ENV{SCSI_IDENT_LUN_T10}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-1$env{SCSI_IDENT_LUN_T10}"
+KERNEL=="sd*", ENV{DEVTYPE}=="partition", ENV{SCSI_IDENT_LUN_T10}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-1$env{SCSI_IDENT_LUN_T10}-part%n"
+
+LABEL="msft_end"