forked from pool/systemd
16ef4de12e
- Fix creation of /dev/root link. - Add remount-ro-before-unmount.patch: always remount read-only before unmounting in final shutdown loop. - Add switch-root-try-pivot-root.patch: try pivot_root before overmounting / - links more manpages for migrated tools (from Christopher Yeleighton). - disable boot.localnet service, ypbind service will do the right thing now (bnc#716746) - add xdm-display-manager.patch: pull xdm.service instead of display-manager.service (needed until xdm initscript is migrated to native systemd service). - Add fix-permissions-btmp.patch: ensure btmp is owned only by root (bnc#777405). - Have the udev package create a tape group, as referenced by 50-udev-default.rules and 60-persistent-storage-tape.rules (DimStar). - Add fix-bad-memory-access.patch: fix crash in journal rotation. - Add fix-dbus-crash.patch: fix D-Bus caused crash. - Add sync-on-shutdown.patch: ensure sync is done when initiating shutdown. - Add mount-efivars.patch: mount efivars if booting on UEFI. - Ship a empty systemd-journald initscript in systemd-logger to stop insserv to complain about missing syslog dependency. - Update 0001-service-Fix-dependencies-added-when-parsing-insserv..patch with bug fixes from Debian. OBS-URL: https://build.opensuse.org/request/show/142568 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=115
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From 0049f05a8bb82c3e084bacc5945596761d706c55 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Fri, 16 Nov 2012 01:30:29 +0100
|
|
Subject: [PATCH] shutdown: readd explicit sync() when shutting down
|
|
|
|
As it turns out reboot() doesn't actually imply a file system sync, but
|
|
only a disk sync. Accordingly, readd explicit sync() invocations
|
|
immediately before we invoke reboot().
|
|
|
|
This is much less dramatic than it might sounds as we umount all
|
|
disks/read-only remount them anyway before going down.
|
|
---
|
|
src/core/service.c | 1 +
|
|
src/core/shutdown.c | 7 +++++++
|
|
2 files changed, 8 insertions(+)
|
|
|
|
diff --git a/src/core/service.c b/src/core/service.c
|
|
index cf08485..df72aba 100644
|
|
--- a/src/core/service.c
|
|
+++ b/src/core/service.c
|
|
@@ -2485,6 +2485,7 @@ static int service_start_limit_test(Service *s) {
|
|
|
|
case SERVICE_START_LIMIT_REBOOT_IMMEDIATE:
|
|
log_warning("%s start request repeated too quickly, rebooting immediately.", UNIT(s)->id);
|
|
+ sync();
|
|
reboot(RB_AUTOBOOT);
|
|
break;
|
|
|
|
diff --git a/src/core/shutdown.c b/src/core/shutdown.c
|
|
index cc8c57b..b59aef1 100644
|
|
--- a/src/core/shutdown.c
|
|
+++ b/src/core/shutdown.c
|
|
@@ -273,6 +273,13 @@ int main(int argc, char *argv[]) {
|
|
}
|
|
}
|
|
|
|
+ /* The kernel will automaticall flush ATA disks and suchlike
|
|
+ * on reboot(), but the file systems need to be synce'd
|
|
+ * explicitly in advance. So let's do this here, but not
|
|
+ * needlessly slow down containers. */
|
|
+ if (!in_container)
|
|
+ sync();
|
|
+
|
|
if (cmd == LINUX_REBOOT_CMD_KEXEC) {
|
|
|
|
if (!in_container) {
|
|
--
|
|
1.7.10.4
|
|
|