summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-02-28 22:04:53 +0100
committerLennart Poettering <lennart@poettering.net>2011-02-28 22:04:53 +0100
commit90e6abaea0cfd25093aae1ad862c5c909ae55829 (patch)
tree27f01d6899eca962475de895c20423f95f3517e9 /src
parent0e01075a2bca7a34c9f1a54baa8d585d0521c2ae (diff)
udev: don't ignore non-encrypted block devices with no superblock
They might be encrypted disks with no LUKS header. https://bugzilla.redhat.com/show_bug.cgi?id=679842
Diffstat (limited to 'src')
-rw-r--r--src/99-systemd.rules5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/99-systemd.rules b/src/99-systemd.rules
index 6a2f97a489..4fba6d4d0b 100644
--- a/src/99-systemd.rules
+++ b/src/99-systemd.rules
@@ -14,7 +14,10 @@ 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"
-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