mirror of
https://github.com/systemd/systemd.git
synced 2024-12-12 03:33:44 +08:00
revert persistent-storage ata-serial '_' '-' replacement
It's not worth changing it, also scsi usually has an underscore in the SERIAL string itself: scsi-SSEAGATE_ST3146854SS_3KN0JH8600008609GTBW scsi-SATA_HTS726060M9AT00_MRH453M4HWHG7B
This commit is contained in:
parent
4febf7f076
commit
1376ba59f6
@ -7,17 +7,17 @@ SUBSYSTEM!="block", GOTO="persistent_storage_end"
|
||||
# skip rules for inappropriate block devices
|
||||
KERNEL=="ram*|loop*|fd*|nbd*|dm-*", GOTO="persistent_storage_end"
|
||||
|
||||
# never access removable ide devices, the drivers are causing event loops on open()
|
||||
# never access non-cdrom removable ide devices, the drivers are causing event loops on open()
|
||||
KERNEL=="hd*[!0-9]", ATTRS{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end"
|
||||
KERNEL=="hd*[0-9]", ATTRS{../removable}=="1", GOTO="persistent_storage_end"
|
||||
KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_storage_end"
|
||||
|
||||
# for partitions import parent information
|
||||
KERNEL=="*[0-9]", IMPORT{parent}=="ID_*"
|
||||
|
||||
# by-id (hardware serial number)
|
||||
KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode"
|
||||
KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}-$env{ID_SERIAL}"
|
||||
KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}-$env{ID_SERIAL}-part%n"
|
||||
KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}"
|
||||
KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
|
||||
|
||||
KERNEL=="sd*[!0-9]|sr*|st*", ATTRS{ieee1394_id}=="*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_BUS}="ieee1394"
|
||||
KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="usb_id -x"
|
||||
@ -35,7 +35,7 @@ KERNEL=="sr*|st*", GOTO="persistent_storage_end"
|
||||
KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
|
||||
|
||||
# by-label/by-uuid (filesystem properties)
|
||||
KERNEL=="*[!0-9]", ATTRS{removable}=="1", GOTO="persistent_storage_end"
|
||||
KERNEL=="*[!0-9]", ATTR{removable}=="1", GOTO="persistent_storage_end"
|
||||
IMPORT{program}="vol_id --export $tempnode"
|
||||
ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
|
||||
ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
|
||||
|
@ -16,8 +16,8 @@ KERNEL=="*[0-9]", IMPORT{parent}=="ID_*"
|
||||
|
||||
# by-id (hardware serial number)
|
||||
KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode"
|
||||
KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}-$env{ID_SERIAL}"
|
||||
KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}-$env{ID_SERIAL}-part%n"
|
||||
KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}"
|
||||
KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
|
||||
|
||||
KERNEL=="sd*[!0-9]|sr*|st*", ATTRS{ieee1394_id}=="*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_BUS}="ieee1394"
|
||||
KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="usb_id -x"
|
||||
|
Loading…
Reference in New Issue
Block a user