summaryrefslogtreecommitdiff
path: root/rules/99-systemd.rules.in
diff options
context:
space:
mode:
authorWouter Verhelst <w@uter.be>2016-04-18 16:29:10 +0200
committerLennart Poettering <lennart@poettering.net>2016-04-18 16:29:10 +0200
commit565754a37efb12916375c68748eefd357aceaeca (patch)
tree636ac08d285a776526f7c16d57f6607a0f4ebd0d /rules/99-systemd.rules.in
parent0b6b45d5e09b48c0637caab85f3b667ec7e8afef (diff)
Mark nbd as inactive until connected (#2422)
Currently, 99-systemd.rules.in contains a line for network block devices, which mark them as inactive until the first change event, and as active from then on forward. This is not correct. A network block device can be connected or disconnected; this state is signalled by the presence or absense of a "pid" file, which contains the PID of the nbd client userspace process that started the connection. Update the rules file so that it checks for the presence of that file to decide what to set SYSTEMD_READY to. Note that current kernels do issue a change event upon connecting the device, but not yet upon disconnecting. While it's possible to wait until that's been fixed, the behaviour of the rule with TEST!="pid" in the absence of a proper uevent is exactly the same as the behaviour of the old rule; so it should be safe to apply now. Signed-off-by: Wouter Verhelst <w@uter.be>
Diffstat (limited to 'rules/99-systemd.rules.in')
-rw-r--r--rules/99-systemd.rules.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
index 0ac4f6af7e..fb4517606d 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -24,8 +24,8 @@ SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="
# Ignore loop devices that don't have any file attached
SUBSYSTEM=="block", KERNEL=="loop[0-9]*", ENV{DEVTYPE}=="disk", TEST!="loop/backing_file", ENV{SYSTEMD_READY}="0"
-# Ignore nbd devices in the "add" event, with "change" the nbd is ready
-ACTION=="add", SUBSYSTEM=="block", KERNEL=="nbd*", ENV{SYSTEMD_READY}="0"
+# Ignore nbd devices until the PID file exists (which signals a connected device)
+SUBSYSTEM=="block", KERNEL=="nbd*", ENV{DEVTYPE}=="disk", TEST!="pid", ENV{SYSTEMD_READY}="0"
# We need a hardware independent way to identify network devices. We
# use the /sys/subsystem/ path for this. Kernel "bus" and "class" names