Set default polling interval on removable devices as well

This is for kernels which have "block" built in instead of being a module.

Closes: #713877

debian/changelog

@@ -35,6 +35,8 @@ systemd (204-9) UNRELEASED; urgency=medium
     which Debian-specific rules are obsolete! Amongst other things, this now
     also reads the hwdb info for USB devices (Closes: #717405) and gets rid of
     some syntax errors (Closes: #706221)
+  * Set default polling interval on removable devices as well, for kernels
+    which have "block" built in instead of being a module. (Closes: #713877)
 
   [ Marco d'Itri ]
   * preinst: check for all the system calls required by modern releases

debian/patches/0052-Set-default-polling-interval-on-removable-devices-as.patch

+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Sat, 26 Apr 2014 16:34:06 +0200
+Subject: Set default polling interval on removable devices as well
+
+The events_dfl_poll_msecs rule will not trigger if "block" is not a module, but
+built in. This will avoid udisks etc. having to poll from userspace, and
+provide proper ejection when the hardware eject button is pressed.
+
+Bug-Debian: https://bugs.debian.org/713877
+Bug-Ubuntu: https://launchpad.net/bugs/890592
+---
+ rules/60-persistent-storage.rules | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
+index a4d009a..566796c 100644
+--- a/rules/60-persistent-storage.rules
++++ b/rules/60-persistent-storage.rules
+@@ -10,6 +10,7 @@ ACTION=="remove", GOTO="persistent_storage_end"
+ 
+ # enable in-kernel media-presence polling
+ ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_poll_msecs}=="0", ATTR{parameters/events_dfl_poll_msecs}="2000"
++ACTION=="add", ATTR{removable}=="1", ATTR{events_poll_msecs}=="-1", ATTR{events_poll_msecs}="2000"
+ 
+ SUBSYSTEM!="block", GOTO="persistent_storage_end"
+ 

debian/patches/series

@@ -49,3 +49,4 @@
 0049-Order-remote-fs.target-after-local-fs.target.patch
 0050-Load-sg-module-from-80-drivers.rules.patch
 0051-Updates-to-default-device-permissions.patch
+0052-Set-default-polling-interval-on-removable-devices-as.patch