From 2c7775ca8ad675b07f29489c1b12ab7db9d3570f Mon Sep 17 00:00:00 2001 From: Vlastimil Holer Date: Wed, 24 Feb 2021 18:26:54 +0100 Subject: [PATCH] B #221: Don't recontextualize on swap cold-plug Closes #221 --- src/lib/udev/rules.d/65-context.rules##apk.one | 1 + src/lib/udev/rules.d/65-context.rules##deb.one | 1 + src/lib/udev/rules.d/65-context.rules##rpm.systemd.one | 1 + src/lib/udev/rules.d/65-context.rules##rpm.sysv.one | 1 + 4 files changed, 4 insertions(+) diff --git a/src/lib/udev/rules.d/65-context.rules##apk.one b/src/lib/udev/rules.d/65-context.rules##apk.one index 198ca7b..fc960b1 100644 --- a/src/lib/udev/rules.d/65-context.rules##apk.one +++ b/src/lib/udev/rules.d/65-context.rules##apk.one @@ -30,4 +30,5 @@ SUBSYSTEM=="scsi", ACTION=="change", \ # Handle swap hot-attach SUBSYSTEM=="block", ACTION=="add", \ ENV{ID_FS_TYPE}=="swap", \ + ENV{DM_ACTIVATION}!="1", \ RUN+="/sbin/service one-context-force restart" diff --git a/src/lib/udev/rules.d/65-context.rules##deb.one b/src/lib/udev/rules.d/65-context.rules##deb.one index c8d00f8..2689334 100644 --- a/src/lib/udev/rules.d/65-context.rules##deb.one +++ b/src/lib/udev/rules.d/65-context.rules##deb.one @@ -35,4 +35,5 @@ SUBSYSTEM=="scsi", ACTION=="change", \ # Handle swap hot-attach SUBSYSTEM=="block", ACTION=="add", \ ENV{ID_FS_TYPE}=="swap", \ + ENV{DM_ACTIVATION}!="1", \ RUN+="/usr/sbin/service one-context-force start" diff --git a/src/lib/udev/rules.d/65-context.rules##rpm.systemd.one b/src/lib/udev/rules.d/65-context.rules##rpm.systemd.one index 0f54e7d..20890df 100644 --- a/src/lib/udev/rules.d/65-context.rules##rpm.systemd.one +++ b/src/lib/udev/rules.d/65-context.rules##rpm.systemd.one @@ -33,4 +33,5 @@ SUBSYSTEM=="scsi", ACTION=="change", \ # Handle swap hot-attach SUBSYSTEM=="block", ACTION=="add", \ ENV{ID_FS_TYPE}=="swap", \ + ENV{DM_ACTIVATION}!="1", \ RUN+="/usr/bin/systemctl --no-block start one-context-force.service" diff --git a/src/lib/udev/rules.d/65-context.rules##rpm.sysv.one b/src/lib/udev/rules.d/65-context.rules##rpm.sysv.one index 1427701..e965e60 100644 --- a/src/lib/udev/rules.d/65-context.rules##rpm.sysv.one +++ b/src/lib/udev/rules.d/65-context.rules##rpm.sysv.one @@ -24,4 +24,5 @@ SUBSYSTEM=="scsi", ACTION=="change", \ # Handle swap hot-attach SUBSYSTEM=="block", ACTION=="add", \ ENV{ID_FS_TYPE}=="swap", \ + ENV{DM_ACTIVATION}!="1", \ RUN+="/sbin/service one-context-force start"