34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 4ce940e9a436ef9d19bd52bd9c2f7ac24d1c842c Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Thu, 6 Nov 2014 15:20:29 +0100
|
|
Subject: [PATCH] systemctl: when invokes as "reboot -f", sync()
|
|
|
|
We do this in the clean shutdown path in shutdown.c, hence we should do
|
|
is for "reboot -f", too.
|
|
|
|
(cherry picked from commit 4a3ad39957399c4a30fc472a804e72907ecaa4f9)
|
|
---
|
|
src/systemctl/systemctl.c | 9 +++++++--
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
|
|
index 8481a9b20c..207a5e78dc 100644
|
|
--- a/src/systemctl/systemctl.c
|
|
+++ b/src/systemctl/systemctl.c
|
|
@@ -6948,8 +6948,13 @@ done:
|
|
|
|
static int halt_now(enum action a) {
|
|
|
|
-/* Make sure C-A-D is handled by the kernel from this
|
|
- * point on... */
|
|
+ /* The kernel will automaticall flush ATA disks and suchlike
|
|
+ * on reboot(), but the file systems need to be synce'd
|
|
+ * explicitly in advance. */
|
|
+ sync();
|
|
+
|
|
+ /* Make sure C-A-D is handled by the kernel from this point
|
|
+ * on... */
|
|
reboot(RB_ENABLE_CAD);
|
|
|
|
switch (a) {
|