Attachment 734743 Details for Bug 1051465

[patch] use-truncated-sysfs-value-for-serial-id.patch

0002-rules-use-truncated-sysfs-value-for-serial-id.patch (text/plain), 2.27 KB, created by Thomas Blume on 2017-08-01 10:18:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Blume

Created: 2017-08-01 10:18:31 UTC

Size: 2.27 KB

patch

obsolete

>From 3fb85f99c64fbb8a538960212e970f94cbcece9e Mon Sep 17 00:00:00 2001
>From: Thomas Blume <Thomas.Blume@suse.com>
>Date: Tue, 1 Aug 2017 10:11:56 +0200
>Subject: [PATCH 2/2] rules: use truncated sysfs value for serial id
>
>bsc#1048679 use truncated sysfs value for serial id to simulate scsi_id output (bsc#1048679)
>---
> rules/61-persistent-storage-compat.rules | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
>diff --git a/rules/61-persistent-storage-compat.rules b/rules/61-persistent-storage-compat.rules
>index fd05f7802..53588e64d 100644
>--- a/rules/61-persistent-storage-compat.rules
>+++ b/rules/61-persistent-storage-compat.rules
>@@ -36,11 +36,13 @@ ENV{COMPAT_SYMLINK_GENERATION}!="?*", ENV{COMPAT_SYMLINK_GENERATION}="1"
> ENV{COMPAT_SYMLINK_GENERATION}!="1", GOTO="generation_2"
> 
> # NVMe links were introduced first via a SUSE specific commit
>-# (bsc#944132) and upstream gained support later but of course using a
>-# different scheme.
>-KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode", ENV{ID_BUS}="nvme"
>-KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
>-KERNEL=="nvme*", ENV{DEVTYPE}=="partition", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
>+# bsc#1048679 use truncated sysfs value for serial id to simulate scsi_id output
>+KERNEL=="nvme*[0-9]n*[0-9]", ENV{DEVTYPE}=="disk", ATTRS{serial}=="?*", ENV{ID_SERIAL_SHORT}="%s{serial}"
>+KERNEL=="nvme*[0-9]n*[0-9]", ENV{DEVTYPE}=="disk", ATTRS{model}=="?*", ENV{ID_MODEL}="%s{model}"
>+KERNEL=="nvme*[0-9]n*[0-9]", ENV{DEVTYPE}=="disk", ENV{ID_MODEL}=="?*", ENV{ID_MODEL_TRUNCATED}="%16E{ID_MODEL}"
>+
>+KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL_TRUNCATED}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL_TRUNCATED}"
>+KERNEL=="nvme*", ENV{DEVTYPE}=="partition", ENV{ID_SERIAL_TRUNCATED}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL_TRUNCATED}-part%n"
> 
> # SCSI compat links for ATA devices, removed by f6ba1a468cea (boo#769002)
> KERNEL=="sd*[!0-9]", ENV{ID_BUS}=="ata", PROGRAM="scsi_id --whitelisted --replace-whitespace -p0x80 -d $devnode", RESULT=="?*", ENV{ID_SCSI_COMPAT}="$result", SYMLINK+="disk/by-id/scsi-$env{ID_SCSI_COMPAT}"
>-- 
>2.12.3
>

Actions: View | Diff

Attachments on bug 1051465: 734741 | 734743 | 734940 | 735115 | 735117 | 739738