valeriyvdovin / rpms / systemd

Forked from rpms/systemd 4 years ago
Clone

Blame SOURCES/0472-rules-40-redhat.rules-rules-should-be-on-one-line.patch

a19bc6
From 33d6abe2452c8222b926f917171d65ed934d0136 Mon Sep 17 00:00:00 2001
a19bc6
From: Lukas Nykryn <lnykryn@redhat.com>
a19bc6
Date: Tue, 11 Apr 2017 15:15:00 +0200
a19bc6
Subject: [PATCH] rules/40-redhat.rules: rules should be on one line
a19bc6
a19bc6
rhel-only
a19bc6
Related: #1274401
a19bc6
---
a19bc6
 rules/40-redhat.rules | 8 ++------
a19bc6
 1 file changed, 2 insertions(+), 6 deletions(-)
a19bc6
a19bc6
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
181b3f
index c928d412b..34a1df9c4 100644
a19bc6
--- a/rules/40-redhat.rules
a19bc6
+++ b/rules/40-redhat.rules
a19bc6
@@ -29,14 +29,10 @@ ACTION=="remove", GOTO="zfcp_scsi_device_end"
a19bc6
 KERNEL=="sd*", SUBSYSTEMS=="ccw", DRIVERS=="zfcp", ENV{.ID_ZFCP_BUS}="1"
a19bc6
 
a19bc6
 # For SCSI disks
a19bc6
-KERNEL=="sd*[!0-9]", SUBSYSTEMS=="scsi",
a19bc6
-        ENV{.ID_ZFCP_BUS}=="1", ENV{DEVTYPE}=="disk",
a19bc6
-        SYMLINK+="disk/by-path/ccw-$attr{hba_id}-zfcp-$attr{wwpn}:$attr{fcp_lun}"
a19bc6
+KERNEL=="sd*[!0-9]", SUBSYSTEMS=="scsi", ENV{.ID_ZFCP_BUS}=="1", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-path/ccw-$attr{hba_id}-zfcp-$attr{wwpn}:$attr{fcp_lun}"
a19bc6
 
a19bc6
 
a19bc6
 # For partitions on a SCSI disk
a19bc6
-KERNEL=="sd*[0-9]", SUBSYSTEMS=="scsi",
a19bc6
-        ENV{.ID_ZFCP_BUS}=="1", ENV{DEVTYPE}=="partition",
a19bc6
-        SYMLINK+="disk/by-path/ccw-$attr{hba_id}-zfcp-$attr{wwpn}:$attr{fcp_lun}-part%n"
a19bc6
+KERNEL=="sd*[0-9]", SUBSYSTEMS=="scsi", ENV{.ID_ZFCP_BUS}=="1", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-path/ccw-$attr{hba_id}-zfcp-$attr{wwpn}:$attr{fcp_lun}-part%n"
a19bc6
 
a19bc6
 LABEL="zfcp_scsi_device_end"