[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH] udev dropped vol_id (#506360)



Looks good to me,

Regards,

Hans


On 06/22/2009 04:02 PM, Jeremy Katz wrote:
udev no longer ships a vol_id binary, so we have to use blkid
instead.  Require a new enough util-linux-ng that this does what
we want
---
  70-anaconda.rules |    4 ++--
  anaconda.spec.in  |    2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/70-anaconda.rules b/70-anaconda.rules
index 374b63a..de7e53b 100644
--- a/70-anaconda.rules
+++ b/70-anaconda.rules
@@ -14,7 +14,7 @@ ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}"

  ENV{DM_STATE}=="SUSPENDED", GOTO="anaconda_end"

-IMPORT{program}="vol_id --export $tempnode"
+IMPORT{program}="blkid -o udev -p $tempnode"
  OPTIONS="link_priority=-100"
  ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"

@@ -37,7 +37,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}="vol_id --export $tempnode"
+IMPORT{program}="blkid -o udev -p $tempnode"
  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}"
diff --git a/anaconda.spec.in b/anaconda.spec.in
index 0a71f92..f4cc1c4 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -113,7 +113,7 @@ Requires: cryptsetup-luks
  Requires: python-cryptsetup>= %{pythoncryptsetupver}
  Requires: mdadm
  Requires: lvm2
-Requires: util-linux-ng
+Requires: util-linux-ng>= 2.15.1
  %ifnarch s390 s390x ppc64
  Requires: system-config-keyboard
  %endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]