diff options
| author | Jeremy Katz <katzj@redhat.com> | 2009-06-22 09:57:00 -0400 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2009-06-26 14:51:12 -0400 |
| commit | fc2e29ef0b3ef617f7536606c7287105859a68a8 (patch) | |
| tree | fd69ba4e838b036d96130c94937ab6d048d5bb7c | |
| parent | a7d8f0a6f6f6cc13d6b9862adc2881bdaa19558f (diff) | |
| download | anaconda-fc2e29ef0b3ef617f7536606c7287105859a68a8.tar.gz anaconda-fc2e29ef0b3ef617f7536606c7287105859a68a8.tar.xz anaconda-fc2e29ef0b3ef617f7536606c7287105859a68a8.zip | |
udev dropped vol_id (#506360)
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
| -rw-r--r-- | 70-anaconda.rules | 4 | ||||
| -rw-r--r-- | anaconda.spec.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/70-anaconda.rules b/70-anaconda.rules index 852003096..0efd53615 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 0a71f9271..f4cc1c47c 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 |