Compare commits

..

No commits in common. "a03cdb173e99e00cd5b720559093fcd71c9826e4" and "7d94934b9dd9ceacc18da914ce781272aee6f573" have entirely different histories.

3 changed files with 3 additions and 2 deletions

View File

@ -1183,7 +1183,7 @@ static int session_open_vt(Session *s) {
return s->vtfd;
}
static int session_prepare_vt(Session *s) {
int session_prepare_vt(Session *s) {
int vt, r;
struct vt_mode mode = {};

View File

@ -161,6 +161,7 @@ KillWho kill_who_from_string(const char *s) _pure_;
const char* tty_validity_to_string(TTYValidity t) _const_;
TTYValidity tty_validity_from_string(const char *s) _pure_;
int session_prepare_vt(Session *s);
void session_leave_vt(Session *s);
bool session_is_controller(Session *s, const char *sender);

View File

@ -1187,7 +1187,7 @@ int portable_detach(
r = unit_file_lookup_state(UNIT_FILE_SYSTEM, &paths, de->d_name, &state);
if (r < 0)
return log_debug_errno(r, "Failed to determine unit file state of '%s': %m", de->d_name);
if (!IN_SET(state, UNIT_FILE_STATIC, UNIT_FILE_DISABLED, UNIT_FILE_LINKED, UNIT_FILE_RUNTIME, UNIT_FILE_LINKED_RUNTIME))
if (!IN_SET(state, UNIT_FILE_STATIC, UNIT_FILE_DISABLED, UNIT_FILE_LINKED, UNIT_FILE_RUNTIME))
return sd_bus_error_setf(error, BUS_ERROR_UNIT_EXISTS, "Unit file '%s' is in state '%s', can't detach.", de->d_name, unit_file_state_to_string(state));
r = unit_file_is_active(bus, de->d_name, error);