dbus-manager.c: log error, why switch-root is refused

This commit is contained in:
Harald Hoyer
2013-04-26 13:33:28 +02:00
parent 910003d022
commit 17f5e4577b
+6 -1
View File
@@ -1503,8 +1503,11 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
}
/* Safety check */
if (isempty(switch_root_init))
if (isempty(switch_root_init)) {
good = path_is_os_tree(switch_root);
if (!good)
log_error("Not switching root: %s does not seem to be an OS tree. /etc/os-release is missing.", switch_root);
}
else {
_cleanup_free_ char *p = NULL;
@@ -1513,6 +1516,8 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
goto oom;
good = access(p, X_OK) >= 0;
if (!good)
log_error("Not switching root: cannot execute new init %s", p);
}
if (!good)
return bus_send_error_reply(connection, message, NULL, -EINVAL);