shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-10 05:18:17 +03:00
Code

Merge pull request #12110 from keszybz/sysv-compat-fix

Browse Source 
Sysv-compat compilation fix
This commit is contained in:
Lennart Poettering 2019-03-27 09:29:13 +01:00 committed by GitHub
commit 49bd196d69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/shared/mount-util.c
View File

@ -107,7 +107,7 @@ static int get_mount_flags(const char *path, unsigned long *flags) {
return 0;
}
/* Use this function only if do you have direct access to /proc/self/mountinfo and need the caller to open it
/* Use this function only if you do not have direct access to /proc/self/mountinfo but the caller can open it
* for you. This is the case when /proc is masked or not mounted. Otherwise, use bind_remount_recursive. */
int bind_remount_recursive_with_mountinfo(
const char *prefix,

3
src/systemctl/systemctl.c
View File

@ -8727,7 +8727,6 @@ _pure_ static int action_to_runlevel(void) {
};
assert(arg_action >= 0 && arg_action < _ACTION_MAX);
return table[arg_action];
}
#endif
@ -8826,9 +8825,11 @@ static int start_with_fallback(void) {
if (start_unit(0, NULL, NULL) == 0)
return 0;
#if HAVE_SYSV_COMPAT
/* Nothing else worked, so let's try /dev/initctl */
if (talk_initctl(action_to_runlevel()) > 0)
return 0;
#endif
return log_error_errno(SYNTHETIC_ERRNO(EIO),
"Failed to talk to init daemon.");

6
src/systemctl/sysv-compat.c
View File

@ -7,8 +7,8 @@
#include "strv.h"
#include "sysv-compat.h"
int talk_initctl(char rl) {
#if HAVE_SYSV_COMPAT
int talk_initctl(char rl) {
struct init_request request;
_cleanup_close_ int fd = -1;
const char *p;
@ -44,10 +44,8 @@ int talk_initctl(char rl) {
return log_error_errno(r, "Failed to write to %s: %m", p);
return 1;
#else
return 0;
#endif
}
#endif
int parse_shutdown_time_spec(const char *t, usec_t *ret) {
assert(t);

3
src/systemctl/sysv-compat.h
View File

@ -3,7 +3,10 @@
#include "time-util.h"
#if HAVE_SYSV_COMPAT
int talk_initctl(char runlevel);
#endif
int parse_shutdown_time_spec(const char *t, usec_t *ret);
/* The init script exit codes for the LSB 'status' verb. (This is different from the 'start' verb, whose exit