diff --git a/dists/flags/main.flags b/dists/flags/main.flags
index 3d16b393d..d6abc1b3b 100644
--- a/dists/flags/main.flags
+++ b/dists/flags/main.flags
@@ -32,6 +32,8 @@ avahi-publish complain
 avahi-resolve complain
 avahi-set-host-name complain
 baloo complain
+blkid attach_disconnected
+btrfs attach_disconnected
 busctl complain
 cc-remote-login-helper complain
 cfdisk complain
@@ -118,7 +120,7 @@ grub-glue-efi complain
 grub-kbdcomp complain
 grub-macbless complain
 grub-menulst2cfg complain
-grub-mkconfig complain
+grub-mkconfig attach_disconnected,complain
 grub-mkdevicemap complain
 grub-mkfont complain
 grub-mkimage complain
@@ -186,7 +188,7 @@ locale-gen complain
 localectl complain
 login attach_disconnected,complain
 loginctl complain
-lvm complain
+lvm attach_disconnected,complain
 lvmconfig complain
 lvmdump complain
 lvmpolld complain