From 35f3ac5bc5930456d700a09407a5f89f06429d4e Mon Sep 17 00:00:00 2001 From: David Lehman Date: Fri, 13 Mar 2009 19:29:41 -0500 Subject: Make paths somewhat flexible so we'll work in normal environments. This is needed for live installs since they run on a normal system. --- 70-anaconda.rules | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to '70-anaconda.rules') diff --git a/70-anaconda.rules b/70-anaconda.rules index 363f7ae3b..374b63a3d 100644 --- a/70-anaconda.rules +++ b/70-anaconda.rules @@ -1,9 +1,12 @@ ACTION!="add|change", GOTO="anaconda_end" SUBSYSTEM!="block", GOTO="anaconda_end" +ENV{ANACBIN}="/sbin" +TEST!="$env{ANACBIN}/dmsetup", ENV{ANACBIN}="/usr/sbin" + KERNEL!="dm-*", GOTO="anaconda_mdraid" -IMPORT{program}="/usr/sbin/dmsetup info -c --nameprefixes --unquoted --rows --noheadings -o name,uuid,suspended,readonly,major,minor,open,tables_loaded -j%M -m%m" +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" ENV{DM_NAME}!="?*", GOTO="anaconda_end" SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}" @@ -25,7 +28,7 @@ TEST!="md/array_state", GOTO="anaconda_mdraid_member" ATTR{md/array_state}=="|clear|inactive", GOTO="anaconda_mdraid_member" LABEL="md_ignore_state" -IMPORT{program}="/usr/sbin/mdadm --detail --export $tempnode" +IMPORT{program}="$env{ANACBIN}/mdadm --detail --export $tempnode" 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}" @@ -42,13 +45,13 @@ ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk LABEL="anaconda_mdraid_member" # probe raid metadata of mdraid member devices -ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/usr/sbin/mdadm --examine --export $tempnode" +ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="$env{ANACBIN}/mdadm --examine --export $tempnode" # probe metadata of LVM2 physical volumes -ENV{ID_FS_TYPE}=="LVM2_member", IMPORT{program}="/usr/sbin/lvm pvs --units k --nosuffix --nameprefixes --rows --unquoted --noheadings -opv_name,pv_uuid,pv_size,vg_name,vg_uuid,pv_pe_count,pv_pe_alloc_count,pe_start $tempnode" +ENV{ID_FS_TYPE}=="LVM2_member", IMPORT{program}="$env{ANACBIN}/lvm pvs --units k --nosuffix --nameprefixes --rows --unquoted --noheadings -opv_name,pv_uuid,pv_size,vg_name,vg_uuid,pv_pe_count,pv_pe_alloc_count,pe_start $tempnode" ENV{LVM2_VG_NAME}!="?*", GOTO="anaconda_end" -ENV{ID_FS_TYPE}=="LVM2_member", IMPORT{program}="/usr/sbin/lvm vgs --units k --nosuffix --nameprefixes --rows --unquoted --noheadings -ouuid,size,free,extent_size,extent_count,free_count,pv_count $env{LVM2_VG_NAME}" -ENV{ID_FS_TYPE}=="LVM2_member", IMPORT{program}="/usr/sbin/lvm lvs --units k --nosuffix --nameprefixes --rows --unquoted --noheadings -olv_name,lv_uuid,lv_size $env{LVM2_VG_NAME}" +ENV{ID_FS_TYPE}=="LVM2_member", IMPORT{program}="$env{ANACBIN}/lvm vgs --units k --nosuffix --nameprefixes --rows --unquoted --noheadings -ouuid,size,free,extent_size,extent_count,free_count,pv_count $env{LVM2_VG_NAME}" +ENV{ID_FS_TYPE}=="LVM2_member", IMPORT{program}="$env{ANACBIN}/lvm lvs --units k --nosuffix --nameprefixes --rows --unquoted --noheadings -olv_name,lv_uuid,lv_size $env{LVM2_VG_NAME}" LABEL="anaconda_end" -- cgit