summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYigit Filiz <yigitfiliz@google.com>2018-04-02 11:54:36 -0700
committerMax Illfelder <illfelder@users.noreply.github.com>2018-04-02 11:54:36 -0700
commit466d82d026e4d7aaeb6e20d75c9beebc7fa2cdf1 (patch)
tree9a0989d2998a8331301dfb0aa2c88d0251891702
parent0bd54db18db9b78e480f70ee1611df3914da13f0 (diff)
downloadgoogle-compute-image-packages-466d82d026e4d7aaeb6e20d75c9beebc7fa2cdf1.tar.gz
Update udev rules to name and symlink NVMe disks and partitions (#582)
* Update udev rules to name and symlink NVMe disks similarly with SCSI disks * Update NVMe naming schema so that mixed configs (NVMe + SCSI) are also supported
-rw-r--r--google_config/udev/65-gce-disk-naming.rules18
1 files changed, 16 insertions, 2 deletions
diff --git a/google_config/udev/65-gce-disk-naming.rules b/google_config/udev/65-gce-disk-naming.rules
index c686837..e258548 100644
--- a/google_config/udev/65-gce-disk-naming.rules
+++ b/google_config/udev/65-gce-disk-naming.rules
@@ -17,8 +17,22 @@
ACTION!="add|change", GOTO="gce_disk_naming_end"
SUBSYSTEM!="block", GOTO="gce_disk_naming_end"
+# SCSI naming
KERNEL=="sd*|vd*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode"
-KERNEL=="sd*|vd*", ENV{ID_SERIAL_SHORT}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}"
-KERNEL=="sd*|vd*", ENV{ID_SERIAL_SHORT}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}-part%n"
+
+# NVME naming
+KERNEL=="nvme0n1*", ENV{ID_SERIAL_SHORT}="local-nvme-ssd-0"
+KERNEL=="nvme0n2*", ENV{ID_SERIAL_SHORT}="local-nvme-ssd-1"
+KERNEL=="nvme0n3*", ENV{ID_SERIAL_SHORT}="local-nvme-ssd-2"
+KERNEL=="nvme0n4*", ENV{ID_SERIAL_SHORT}="local-nvme-ssd-3"
+KERNEL=="nvme0n5*", ENV{ID_SERIAL_SHORT}="local-nvme-ssd-4"
+KERNEL=="nvme0n6*", ENV{ID_SERIAL_SHORT}="local-nvme-ssd-5"
+KERNEL=="nvme0n7*", ENV{ID_SERIAL_SHORT}="local-nvme-ssd-6"
+KERNEL=="nvme0n8*", ENV{ID_SERIAL_SHORT}="local-nvme-ssd-7"
+KERNEL=="nvme*", ENV{ID_SERIAL}="Google_EphemeralDisk_$env{ID_SERIAL_SHORT}"
+
+# Symlinks
+KERNEL=="sd*|vd*|nvme*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}"
+KERNEL=="sd*|vd*|nvme*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}-part%n"
LABEL="gce_disk_naming_end"