X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2F99-systemd.rules;h=186ef45f49f5400b566cefdf3d5580c6f0428135;hb=7948c4dfbea73ac21250b588089039aa17a90386;hp=2528b282d2f6676c952719024baa2ba7f2a2bcc6;hpb=230e12e3379a4311b939476758b2375f08320aaa;p=elogind.git

diff --git a/src/99-systemd.rules b/src/99-systemd.rules
index 2528b282d..186ef45f4 100644
--- a/src/99-systemd.rules
+++ b/src/99-systemd.rules
@@ -8,12 +8,14 @@
 ACTION!="add|change", GOTO="systemd_end"
 
 SUBSYSTEM=="tty", KERNEL=="tty[0-9]|tty1[0-2]", TAG+="systemd"
-SUBSYSTEM=="tty", KERNEL=="ttyS*", TAG+="systemd"
-SUBSYSTEM=="tty", KERNEL=="hvc*", TAG+="systemd"
+SUBSYSTEM=="tty", KERNEL=="tty[a-zA-Z]*|hvc*", TAG+="systemd"
 
 SUBSYSTEM=="block", KERNEL!="ram*|loop*", TAG+="systemd"
 SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0"
-SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0"
+
+# Ignore encrypted devices with no identified superblock on it, since
+# we are probably still calling mke2fs or mkswap on it.
+SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0"
 
 # We need a hardware independent way to identify network devices. We
 # use the /sys/subsystem path for this. Current vanilla kernels don't