Compare commits

...

3 Commits

Author SHA1 Message Date
Franck Bui a03cdb173e logind: make session_prepare_vt() static 2019-10-16 10:45:25 +09:00
Anita Zhang 74f632aca4
Merge pull request #13726 from bluca/portable_detach_symlink
portabled: allow to detach an image with a unit in linked-runtime state
2019-10-15 17:16:51 -07:00
Luca Boccassi c3d809ef72 portabled: allow to detach an image with a unit in linked-runtime state
This is necessary when a directory was attached with
--copy=symlink, otherwise detach will always fail.

Fixed #13725
2019-10-04 14:45:41 +01:00
3 changed files with 2 additions and 3 deletions

View File

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

View File

@ -161,7 +161,6 @@ KillWho kill_who_from_string(const char *s) _pure_;
const char* tty_validity_to_string(TTYValidity t) _const_; const char* tty_validity_to_string(TTYValidity t) _const_;
TTYValidity tty_validity_from_string(const char *s) _pure_; TTYValidity tty_validity_from_string(const char *s) _pure_;
int session_prepare_vt(Session *s);
void session_leave_vt(Session *s); void session_leave_vt(Session *s);
bool session_is_controller(Session *s, const char *sender); 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); r = unit_file_lookup_state(UNIT_FILE_SYSTEM, &paths, de->d_name, &state);
if (r < 0) if (r < 0)
return log_debug_errno(r, "Failed to determine unit file state of '%s': %m", de->d_name); 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)) if (!IN_SET(state, UNIT_FILE_STATIC, UNIT_FILE_DISABLED, UNIT_FILE_LINKED, UNIT_FILE_RUNTIME, UNIT_FILE_LINKED_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)); 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); r = unit_file_is_active(bus, de->d_name, error);