linux-raid.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] Modernize udev rules
@ 2013-02-09 17:48 Thomas Bächler
  2013-02-09 17:48 ` [PATCH 2/2] udev: Fix order of execution of the md rules Thomas Bächler
  2013-02-11  0:20 ` [PATCH 1/2] Modernize udev rules NeilBrown
  0 siblings, 2 replies; 12+ messages in thread
From: Thomas Bächler @ 2013-02-09 17:48 UTC (permalink / raw)
  To: linux-raid; +Cc: neilb, Thomas Bächler

* $tempnode is deprecated, use $devnode
* blkid -o udev output is deprecated, use IMPORT{builtin}="blkid" instead
---
 udev-md-raid.rules | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/udev-md-raid.rules b/udev-md-raid.rules
index cc7f5ef..ea97261 100644
--- a/udev-md-raid.rules
+++ b/udev-md-raid.rules
@@ -10,7 +10,7 @@ LABEL="md_inc"
 
 # remember you can limit what gets auto/incrementally assembled by
 # mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY'
-ACTION=="add", RUN+="/sbin/mdadm --incremental $tempnode --offroot"
+ACTION=="add", RUN+="/sbin/mdadm --incremental $devnode --offroot"
 ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}"
 ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name"
 
@@ -31,7 +31,7 @@ TEST!="md/array_state", ENV{SYSTEMD_READY}="0", GOTO="md_end"
 ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end"
 LABEL="md_ignore_state"
 
-IMPORT{program}="/sbin/mdadm --detail --export $tempnode"
+IMPORT{program}="/sbin/mdadm --detail --export $devnode"
 ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace"
 ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
 ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}"
@@ -40,7 +40,7 @@ ENV{DEVTYPE}=="partition", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env
 ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n"
 ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n"
 
-IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
+IMPORT{builtin}="blkid"
 OPTIONS+="link_priority=100"
 OPTIONS+="watch"
 ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
-- 
1.8.1.3


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2013-02-11 10:48 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-09 17:48 [PATCH 1/2] Modernize udev rules Thomas Bächler
2013-02-09 17:48 ` [PATCH 2/2] udev: Fix order of execution of the md rules Thomas Bächler
2013-02-09 20:49   ` [PATCHv2 " Thomas Bächler
2013-02-11  0:31     ` NeilBrown
2013-02-11 10:01       ` Thomas Bächler
2013-02-11  0:20 ` [PATCH 1/2] Modernize udev rules NeilBrown
2013-02-11  8:33   ` Michael Tokarev
2013-02-11 10:11     ` Thomas Bächler
2013-02-11 10:16       ` Michael Tokarev
2013-02-11 10:19         ` Thomas Bächler
2013-02-11 10:44       ` Dmitrijs Ledkovs
2013-02-11 10:48         ` Thomas Bächler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).