2e6aa36589
- Import a better fix from upstream for bsc#1001765 - Added: 0001-pid1-more-informative-error-message-for-ignored-noti.patch 0001-pid1-process-zero-length-notification-messages-again.patch - Updated (no code changes, only patch metadata) 0001-If-the-notification-message-length-is-0-ignore-the-m.patch 0001-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch - Re add back "udev: don't require nsserv and fillup" Did this in the wrong project... it was a complicated day today ;) - Added 2 patches to fix bsc#1001765 0001-If-the-notification-message-length-is-0-ignore-the-m.patch 0001-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch - Revert "udev: don't require nsserv and fillup" It's been judged too late for being part of SLE12 final release. Nevertheless it's part of Factory and will be reintroduced after the final release is out (ie through an update). - systemd-sysv-convert: make sure that /var/lib/systemd/sysv-convert/database is always initialized (bsc#982211) If "--save" command was used and the sysv init script wasn't enabled at all the database file wasn't created at all. This makes the subsequent call to "--apply" fail even though this should not considered as an error. - Added patches to fix journal with FSS protection enabled (bsc#1000435) 0001-journal-fix-HMAC-calculation-when-appending-a-data-o.patch 0001-journal-set-STATE_ARCHIVED-as-part-of-offlining-2740.patch OBS-URL: https://build.opensuse.org/request/show/431464 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=241
52 lines
2.3 KiB
Diff
52 lines
2.3 KiB
Diff
From 31ae8c8741ce9595f4053234d6a6b2fb3616fedf Mon Sep 17 00:00:00 2001
|
|
From: bgbhpe <brian.boylston@hpe.com>
|
|
Date: Fri, 8 Jul 2016 11:43:56 -0400
|
|
Subject: [PATCH 1/1] rules: block: add support for pmem devices (#3683)
|
|
|
|
Persistent memory devices can be exposed as block devices as /dev/pmemN
|
|
and /dev/pmemNs. pmemN is the raw device and is byte-addressable from
|
|
within the kernel and when mmapped by applications from a DAX-mounted
|
|
file system. pmemNs has the block translation table (BTT) layered on top,
|
|
offering atomic sector/block access. Both pmemN and pmemNs are expected
|
|
to contain file systems.
|
|
|
|
blkid(8) and lsblk(8) seem to correctly report on pmemN and pmemNs.
|
|
systemd v219 will populate /dev/disk/by-uuid/ when, for example, mkfs is
|
|
used on pmem, but systemd v228 does not.
|
|
|
|
Add pmem to the whitelist.
|
|
(cherry picked from commit f3bc4ccc2edf5ad2a99d6ba2795b9999fe76c3df)
|
|
|
|
[tblume: fixes bsc#988119]
|
|
---
|
|
rules/60-block.rules | 2 +-
|
|
rules/60-persistent-storage.rules | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/rules/60-block.rules b/rules/60-block.rules
|
|
index c74caca..42c7597 100644
|
|
--- a/rules/60-block.rules
|
|
+++ b/rules/60-block.rules
|
|
@@ -8,4 +8,4 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_
|
|
ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", ATTR{block/*/uevent}="change"
|
|
|
|
# watch metadata changes, caused by tools closing the device node which was opened for writing
|
|
-ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*", OPTIONS+="watch"
|
|
+ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*|pmem*", OPTIONS+="watch"
|
|
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
|
|
index ee1fb08f..ef5d205 100644
|
|
--- a/rules/60-persistent-storage.rules
|
|
+++ b/rules/60-persistent-storage.rules
|
|
@@ -6,7 +6,7 @@
|
|
ACTION=="remove", GOTO="persistent_storage_end"
|
|
|
|
SUBSYSTEM!="block", GOTO="persistent_storage_end"
|
|
-KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*", GOTO="persistent_storage_end"
|
|
+KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|pmem*", GOTO="persistent_storage_end"
|
|
|
|
# ignore partitions that span the entire disk
|
|
TEST=="whole_disk", GOTO="persistent_storage_end"
|
|
--
|
|
2.10.0
|
|
|