From 0913b597d61b9b430654d7ab06528cdfcfaf06f4 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Wed, 4 Jan 2017 14:20:53 +1100 Subject: [PATCH] Simplify special-case for md in 69-dm-lvm-metadata.rules This special casing brings little value. It appears to attempt to determine if the array is active yet or not, and to skip processing if the array has not yet been started. However, if the array hasn't been started, then "blkid" will not have been able to read a signature, so: ENV{ID_FS_TYPE}!="LVM2_member|LVM1_member", GOTO="lvm_end" will have caused all this code to be skipped. Further, this code causes incorrect behaviour in at least one case. It assumes that the first "add" event should be ignored, as it will be followed by a "change" event which indicates the array coming on line. This is consistent with how the kernel sends events, but not always consistent with how this script sees event. Specifically: if the initrd has "mdadm" support installed, but not "lvm2" support, then the initial "add" and "change" events will happen while the initrd is in charge and this file is not available. Once the root filesystem is mountd, this file will be available and "udevadm trigger --action=add" will be run. So the first and only event seen by this script for an md device will be "add", and it will incorrectly ignore it. So replace the special handling with code that simply jumps to lvm_scan on any 'add' or 'change' event. Signed-off-by: NeilBrown --- udev/69-dm-lvm-metad.rules.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/udev/69-dm-lvm-metad.rules.in b/udev/69-dm-lvm-metad.rules.in index bd75fc8efcd5..fcbb7f755eba 100644 --- a/udev/69-dm-lvm-metad.rules.in +++ b/udev/69-dm-lvm-metad.rules.in @@ -54,13 +54,11 @@ ENV{DM_UDEV_PRIMARY_SOURCE_FLAG}=="1", ENV{DM_ACTIVATION}=="1", GOTO="lvm_scan" GOTO="lvm_end" # MD device: +# Need to scan on both 'add' and 'change' LABEL="next" KERNEL!="md[0-9]*", GOTO="next" -IMPORT{db}="LVM_MD_PV_ACTIVATED" -ACTION=="add", ENV{LVM_MD_PV_ACTIVATED}=="1", GOTO="lvm_scan" -ACTION=="change", ENV{LVM_MD_PV_ACTIVATED}!="1", TEST=="md/array_state", ENV{LVM_MD_PV_ACTIVATED}="1", GOTO="lvm_scan" -ACTION=="add", KERNEL=="md[0-9]*p[0-9]*", GOTO="lvm_scan" -ENV{LVM_MD_PV_ACTIVATED}!="1", ENV{SYSTEMD_READY}="0" +ACTION=="add", GOTO="lvm_scan" +ACTION=="change", GOTO="lvm_scan" GOTO="lvm_end" # Loop device: -- 2.11.0