32 lines
1.5 KiB
Diff
32 lines
1.5 KiB
Diff
|
From 6ad3b2b62cbe34cc02ee98deb5f48047f5e42d26 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||
|
|
Date: Sat, 30 Aug 2014 17:22:42 -0400
|
||
|
|
Subject: [PATCH] systemd: fix error message
|
||
|
|
|
||
|
|
---
|
||
|
|
src/core/dbus-manager.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
|
||
|
|
index 008cf6b4cd..e792fe7e28 100644
|
||
|
|
--- a/src/core/dbus-manager.c
|
||
|
|
+++ b/src/core/dbus-manager.c
|
||
|
|
@@ -1241,7 +1241,7 @@ static int method_switch_root(sd_bus *bus, sd_bus_message *message, void *userda
|
||
|
|
return r;
|
||
|
|
|
||
|
|
if (m->running_as != SYSTEMD_SYSTEM)
|
||
|
|
- return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, "KExec is only supported for system managers.");
|
||
|
|
+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, "Root switching is only supported by system manager.");
|
||
|
|
|
||
|
|
r = sd_bus_message_read(message, "ss", &root, &init);
|
||
|
|
if (r < 0)
|
||
|
|
@@ -1252,7 +1252,7 @@ static int method_switch_root(sd_bus *bus, sd_bus_message *message, void *userda
|
||
|
|
|
||
|
|
/* Safety check */
|
||
|
|
if (isempty(init)) {
|
||
|
|
- if (! path_is_os_tree(root))
|
||
|
|
+ if (!path_is_os_tree(root))
|
||
|
|
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Specified switch root path %s does not seem to be an OS tree. os-release file is missing.", root);
|
||
|
|
} else {
|
||
|
|
_cleanup_free_ char *p = NULL;
|