From 0780f3e25fb6c575510ea1f19948dba3b05c47c7 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 9 Jul 2009 09:08:08 +0200 Subject: 70-anaconda.rules: always import blkid output We are currently not calling blkid when a block device is not an mdraid set or a device mapper device, resulting in us not identifying mdraid members as such. This probably worked when still using vol_id because some other rules file was doing an import vol_id before our rules. --- 70-anaconda.rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '70-anaconda.rules') diff --git a/70-anaconda.rules b/70-anaconda.rules index 0efd53615..0fd76472c 100644 --- a/70-anaconda.rules +++ b/70-anaconda.rules @@ -4,6 +4,8 @@ SUBSYSTEM!="block", GOTO="anaconda_end" ENV{ANACBIN}="/sbin" TEST!="$env{ANACBIN}/dmsetup", ENV{ANACBIN}="/usr/sbin" +IMPORT{program}="$env{ANACBIN}/blkid -o udev -p $tempnode" + KERNEL!="dm-*", GOTO="anaconda_mdraid" IMPORT{program}="$env{ANACBIN}/dmsetup info -c --nameprefixes --unquoted --rows --noheadings -o name,uuid,suspended,readonly,major,minor,open,tables_loaded -j%M -m%m" @@ -14,7 +16,6 @@ ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}" ENV{DM_STATE}=="SUSPENDED", GOTO="anaconda_end" -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 +38,6 @@ 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}="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}" -- cgit