daandemeyer / rpms / systemd

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