File 0001-add-hdflush-for-reboot-or-hddown-for-power... of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-add-hdflush-for-reboot-or-hddown-for-poweroff.patch of Package systemd (Revision 813af9220524f0418b21463a09d6fcd4)

Currently displaying revision 813af9220524f0418b21463a09d6fcd4 , Show latest

---
 src/core/shutdown.c       |    4 ++++
 src/systemctl/systemctl.c |   18 ++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

Index: systemd-221/src/core/shutdown.c
===================================================================
--- systemd-221.orig/src/core/shutdown.c
+++ systemd-221/src/core/shutdown.c
@@ -396,6 +396,10 @@ int main(int argc, char *argv[]) {
         }
 
         reboot(cmd);
+
+        if (cmd == (int)RB_POWER_OFF)
+                reboot(RB_HALT_SYSTEM);
+
         if (errno == EPERM && in_container) {
                 /* If we are in a container, and we lacked
                  * CAP_SYS_BOOT just exit, this will kill our
Index: systemd-221/src/systemctl/systemctl.c
===================================================================
--- systemd-221.orig/src/systemctl/systemctl.c
+++ systemd-221/src/systemctl/systemctl.c
@@ -93,6 +93,7 @@ static bool arg_no_pager = false;
 static bool arg_no_wtmp = false;
 static bool arg_no_wall = false;
 static bool arg_no_reload = false;
+static bool arg_no_sync = false;
 static bool arg_show_types = false;
 static bool arg_ignore_inhibitors = false;
 static bool arg_dry = false;
@@ -6636,6 +6637,7 @@ static int halt_parse_argv(int argc, cha
                 { "reboot",    no_argument,       NULL, ARG_REBOOT  },
                 { "force",     no_argument,       NULL, 'f'         },
                 { "wtmp-only", no_argument,       NULL, 'w'         },
+                { "no-sync",   no_argument,       NULL, 'n'         },
                 { "no-wtmp",   no_argument,       NULL, 'd'         },
                 { "no-wall",   no_argument,       NULL, ARG_NO_WALL },
                 {}
@@ -6688,10 +6690,13 @@ static int halt_parse_argv(int argc, cha
 
                 case 'i':
                 case 'h':
-                case 'n':
                         /* Compatibility nops */
                         break;
 
+                case 'n':
+                        arg_no_sync = true;
+                        break;
+
                 case '?':
                         return -EINVAL;
 
@@ -7291,7 +7296,8 @@ static int halt_now(enum action a) {
         /* The kernel will automaticall flush ATA disks and suchlike
          * on reboot(), but the file systems need to be synce'd
          * explicitly in advance. */
-        sync();
+        if (!arg_no_sync)
+                sync();
 
         /* Make sure C-A-D is handled by the kernel from this point
          * on... */
@@ -7299,14 +7305,14 @@ static int halt_now(enum action a) {
 
         switch (a) {
 
-        case ACTION_HALT:
-                log_info("Halting.");
-                reboot(RB_HALT_SYSTEM);
-                return -errno;
 
         case ACTION_POWEROFF:
                 log_info("Powering off.");
                 reboot(RB_POWER_OFF);
+                /* fall-through */
+        case ACTION_HALT:
+                log_info("Halting.");
+                reboot(RB_HALT_SYSTEM);
                 return -errno;
 
         case ACTION_REBOOT: {

Places

File 0001-add-hdflush-for-reboot-or-hddown-for-poweroff.patch of Package systemd (Revision 813af9220524f0418b21463a09d6fcd4)

Places