daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
a19bc6
From 0f3a67a0e4d243952e9ae4965a30e704885f03ef Mon Sep 17 00:00:00 2001
a19bc6
From: Michal Sekletar <msekletar@users.noreply.github.com>
a19bc6
Date: Fri, 6 Jan 2017 10:27:35 +0100
a19bc6
Subject: [PATCH] tests: fix failure of test-execute if /dev/mem is not
a19bc6
 available (#5028)
a19bc6
a19bc6
/dev/mem isn't necessarily available. Recently, I've encountered arm64
a19bc6
systems that didn't provide raw memory access via /dev/mem. Instead,
a19bc6
let's use /dev/kmsg since we don't support systems w/o it anyway.
a19bc6
a19bc6
Cherry-picked from: 01349f5d01e0b59168722403b0c1c2325b15512c
a19bc6
Resolves: #1410056
a19bc6
---
a19bc6
 test/exec-privatedevices-no.service  | 2 +-
a19bc6
 test/exec-privatedevices-yes.service | 2 +-
a19bc6
 2 files changed, 2 insertions(+), 2 deletions(-)
a19bc6
a19bc6
diff --git a/test/exec-privatedevices-no.service b/test/exec-privatedevices-no.service
181b3f
index cf4f275fb..af1daf78f 100644
a19bc6
--- a/test/exec-privatedevices-no.service
a19bc6
+++ b/test/exec-privatedevices-no.service
a19bc6
@@ -2,6 +2,6 @@
a19bc6
 Description=Test for PrivateDev=no
a19bc6
 
a19bc6
 [Service]
a19bc6
-ExecStart=/bin/sh -c 'exit $(test -c /dev/mem)'
a19bc6
+ExecStart=/bin/sh -c 'exit $(test -c /dev/kmsg)'
a19bc6
 Type=oneshot
a19bc6
 PrivateDevices=no
a19bc6
diff --git a/test/exec-privatedevices-yes.service b/test/exec-privatedevices-yes.service
181b3f
index 85b3f4f98..384a7b01a 100644
a19bc6
--- a/test/exec-privatedevices-yes.service
a19bc6
+++ b/test/exec-privatedevices-yes.service
a19bc6
@@ -2,6 +2,6 @@
a19bc6
 Description=Test for PrivateDev=yes
a19bc6
 
a19bc6
 [Service]
a19bc6
-ExecStart=/bin/sh -c 'exit $(test ! -c /dev/mem)'
a19bc6
+ExecStart=/bin/sh -c 'exit $(test ! -c /dev/kmsg)'
a19bc6
 Type=oneshot
a19bc6
 PrivateDevices=yes