X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2F99-systemd.rules;h=4fba6d4d0b699591a70f75e99acf69646b4114b4;hp=5cdb9e0e9ac4c740bead62915ceda15a9172f2db;hb=b997812119882f95a9456ce15667b0545be8e417;hpb=b7cf1b68a79833411851fa547ac9b4906207c224 diff --git a/src/99-systemd.rules b/src/99-systemd.rules index 5cdb9e0e9..4fba6d4d0 100644 --- a/src/99-systemd.rules +++ b/src/99-systemd.rules @@ -7,12 +7,17 @@ ACTION!="add|change", GOTO="systemd_end" -ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0" - -KERNEL=="tty[0-9]|tty1[0-2]", TAG+="systemd" -KERNEL=="ttyS*", TAG+="systemd" +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=="ttyUSB*", 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" + +# 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