Commit 21c55fb7 authored by Martin Pitt's avatar Martin Pitt

rules: Fix by-path of mmc RPMB partitions and don't blkid them

This avoids kernel buffer I/O errors and timeouts.

Patch cherry-picked from upstream git.

LP: #1333140
parent f1a42bae
......@@ -21,6 +21,8 @@ systemd (215-12) UNRELEASED; urgency=medium
* boot-and-services autopkgtest: Add CgroupsTest to check cgroup
creation/cleanup behaviour. This reproduces #777601 and verifies the fix
for it.
* rules: Fix by-path of mmc RPMB partitions and don't blkid them. Avoids
kernel buffer I/O errors and timeouts. (LP: #1333140)
[ Michael Biebl ]
* core: Don't fail to run services in --user instances if $HOME is missing.
......
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Wed, 11 Feb 2015 15:26:52 +0100
Subject: rules: Fix by-path of mmc RPMB partitions and don't blkid them
Linux 3.10+ exposes RPMB (Replay Protected Memory Block) partitions of MMC
devices [1] ; trying to read them with blkid or other unspecific means will
cause kernel buffer I/O errors and timeouts.
Blacklist those to prevent creating wrong by-path links and
blkid'ing those.
[1] http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=090d25fe224c0
https://launchpad.net/bugs/1333140
---
rules/60-persistent-storage.rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
index 475b151..25b44a5 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -14,7 +14,7 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_
SUBSYSTEM!="block", GOTO="persistent_storage_end"
# skip rules for inappropriate block devices
-KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*|zram*", GOTO="persistent_storage_end"
+KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*|zram*|mmcblk[0-9]*rpmb", GOTO="persistent_storage_end"
# ignore partitions that span the entire disk
TEST=="whole_disk", GOTO="persistent_storage_end"
......@@ -133,6 +133,7 @@ sysv-generator-Replace-Provides-symlinks-with-real-u.patch
journal-Fix-syslog-forwarding-without-CAP_SYS_ADMIN.patch
logind-handle-closing-sessions-over-daemon-restarts.patch
logind-fix-sd_eviocrevoke-ioctl-call.patch
rules-Fix-by-path-of-mmc-RPMB-partitions-and-don-t-b.patch
## Debian specific patches:
Add-back-support-for-Debian-specific-config-files.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment