dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-15 20:10:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

reboot-util: unify reboot with parameter in a single implementation

Browse Source 
So far, we had two implementations of reboot-with-parameter doing pretty
much the same. Let's unify that in a generic implementation used by
both.

This is particulary nice as it unifies all /run/systemd/reboot-param
handling in a single .c file.
This commit is contained in:
Lennart Poettering
2018-02-21 18:48:49 +01:00
parent e3631d1c80
commit c01dcddf80
4 changed files with 67 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/basic/reboot-util.c
View File

@@ -3,11 +3,14 @@
#include <errno.h>
#include <unistd.h>
#include "alloc-util.h"
#include "fileio.h"
#include "log.h"
#include "raw-reboot.h"
#include "reboot-util.h"
#include "string-util.h"
#include "umask-util.h"
#include "virt.h"
int update_reboot_parameter_and_warn(const char *parameter) {
int r;
@@ -32,3 +35,49 @@ int update_reboot_parameter_and_warn(const char *parameter) {
return 0;
}
int reboot_with_parameter(RebootFlags flags) {
int r;
/* Reboots the system with a parameter that is read from /run/systemd/reboot-param. Returns 0 if REBOOT_DRY_RUN
* was set and the actual reboot operation was hence skipped. If REBOOT_FALLBACK is set and the reboot with
* parameter doesn't work out a fallback to classic reboot() is attempted. If REBOOT_FALLBACK is not set, 0 is
* returned instead, which should be considered indication for the caller to fall back to reboot() on its own,
* or somehow else deal with this. If REBOOT_LOG is specified will log about what it is going to do, as well as
* all errors. */
if (detect_container() == 0) {
_cleanup_free_ char *parameter = NULL;
r = read_one_line_file("/run/systemd/reboot-param", &parameter);
if (r < 0 && r != -ENOENT)
log_full_errno(flags & REBOOT_LOG ? LOG_WARNING : LOG_DEBUG, r,
"Failed to read reboot parameter file, ignoring: %m");
if (!isempty(parameter)) {
log_full(flags & REBOOT_LOG ? LOG_INFO : LOG_DEBUG,
"Rebooting with argument '%s'.", parameter);
if (flags & REBOOT_DRY_RUN)
return 0;
(void) raw_reboot(LINUX_REBOOT_CMD_RESTART2, parameter);
log_full_errno(flags & REBOOT_LOG ? LOG_WARNING : LOG_DEBUG, errno,
"Failed to reboot with parameter, retrying without: %m");
}
}
if (!(flags & REBOOT_FALLBACK))
return 0;
log_full(flags & REBOOT_LOG ? LOG_INFO : LOG_DEBUG, "Rebooting.");
if (flags & REBOOT_DRY_RUN)
return 0;
(void) reboot(RB_AUTOBOOT);
return log_full_errno(flags & REBOOT_LOG ? LOG_ERR : LOG_DEBUG, errno, "Failed to reboot: %m");
}

8
src/basic/reboot-util.h
View File

@@ -2,3 +2,11 @@
#pragma once
int update_reboot_parameter_and_warn(const char *parameter);
typedef enum RebootFlags {
REBOOT_LOG = 1U << 0, /* log about what we are going to do and all errors */
REBOOT_DRY_RUN = 1U << 1, /* return 0 right before actually doing the reboot */
REBOOT_FALLBACK = 1U << 2, /* fallback to plain reboot() if argument-based reboot doesn't work, isn't configured or doesn't apply otherwise */
} RebootFlags;
int reboot_with_parameter(RebootFlags flags);