chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support additional argument in reboot
[elogind.git]
/
src
/
core
/
shutdown.c
diff --git
a/src/core/shutdown.c
b/src/core/shutdown.c
index 4709746de40b616fde8b8fbcb17260b9b5d34c21..377c1971a37d130bc9addaf6f639e82a11d37c3d 100644
(file)
--- a/
src/core/shutdown.c
+++ b/
src/core/shutdown.c
@@
-46,6
+46,8
@@
#include "virt.h"
#include "watchdog.h"
#include "killall.h"
#include "virt.h"
#include "watchdog.h"
#include "killall.h"
+#include "cgroup-util.h"
+#include "def.h"
#define FINALIZE_ATTEMPTS 50
#define FINALIZE_ATTEMPTS 50
@@
-131,16
+133,16
@@
static int pivot_to_new_root(void) {
}
int main(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
- _cleanup_free_ char *line = NULL;
- int cmd, r;
- unsigned retries;
bool need_umount = true, need_swapoff = true, need_loop_detach = true, need_dm_detach = true;
bool in_container, use_watchdog = false;
bool need_umount = true, need_swapoff = true, need_loop_detach = true, need_dm_detach = true;
bool in_container, use_watchdog = false;
+ _cleanup_free_ char *line = NULL, *cgroup = NULL, *param = NULL;
char *arguments[3];
char *arguments[3];
+ unsigned retries;
+ int cmd, r;
/* suppress shutdown status output if 'quiet' is used */
/* suppress shutdown status output if 'quiet' is used */
- r =
read_one_line_file("/proc/cmdline",
&line);
- if (r >
=
0) {
+ r =
proc_cmdline(
&line);
+ if (r > 0) {
char *w, *state;
size_t l;
char *w, *state;
size_t l;
@@
-172,9
+174,11
@@
int main(int argc, char *argv[]) {
in_container = detect_container(NULL) > 0;
in_container = detect_container(NULL) > 0;
- if (streq(argv[1], "reboot"))
+ if (streq(argv[1], "reboot"))
{
cmd = RB_AUTOBOOT;
cmd = RB_AUTOBOOT;
- else if (streq(argv[1], "poweroff"))
+ /* if this fails, that's OK */
+ read_one_line_file(REBOOT_PARAM_FILE, ¶m);
+ } else if (streq(argv[1], "poweroff"))
cmd = RB_POWER_OFF;
else if (streq(argv[1], "halt"))
cmd = RB_HALT_SYSTEM;
cmd = RB_POWER_OFF;
else if (streq(argv[1], "halt"))
cmd = RB_HALT_SYSTEM;
@@
-186,6
+190,8
@@
int main(int argc, char *argv[]) {
goto error;
}
goto error;
}
+ cg_get_root_path(&cgroup);
+
use_watchdog = !!getenv("WATCHDOG_USEC");
/* lock us into memory */
use_watchdog = !!getenv("WATCHDOG_USEC");
/* lock us into memory */
@@
-210,6
+216,13
@@
int main(int argc, char *argv[]) {
if (use_watchdog)
watchdog_ping();
if (use_watchdog)
watchdog_ping();
+ /* Let's trim the cgroup tree on each iteration so
+ that we leave an empty cgroup tree around, so that
+ container managers get a nice notify event when we
+ are down */
+ if (cgroup)
+ cg_trim(SYSTEMD_CGROUP_CONTROLLER, cgroup, false);
+
if (need_umount) {
log_info("Unmounting file systems.");
r = umount_all(&changed);
if (need_umount) {
log_info("Unmounting file systems.");
r = umount_all(&changed);
@@
-327,7
+340,11
@@
int main(int argc, char *argv[]) {
cmd = RB_AUTOBOOT;
}
cmd = RB_AUTOBOOT;
}
- reboot(cmd);
+ if (param)
+ syscall(SYS_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2,
+ LINUX_REBOOT_CMD_RESTART2, param);
+ else
+ reboot(cmd);
if (errno == EPERM && in_container) {
/* If we are in a container, and we lacked
if (errno == EPERM && in_container) {
/* If we are in a container, and we lacked