Merge pull request #100 from yast/sync_after_restore

yast · Jun 6, 2018 · d10738e · d10738e
2 parents beb7fe8 + 5104e4b
commit d10738e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/package/yast2-update.changes b/package/yast2-update.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jun  6 11:19:12 UTC 2018 - lslezak@suse.cz
+
+- Flush the disk cache after restoring the backup to mitigate
+  risk of data loss after unexpected reboot/poweroff after aborting
+  upgrade (bsc#1089643)
+- 4.0.15
+
 -------------------------------------------------------------------
 Wed May  9 10:20:03 UTC 2018 - lslezak@suse.cz
 

diff --git a/package/yast2-update.spec b/package/yast2-update.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-update
-Version:        4.0.14
+Version:        4.0.15
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/Update.rb b/src/modules/Update.rb
@@ -891,6 +891,10 @@ def create_restore_script(script_path, tarball_path, paths)
 tar xvf #{tarball_path} --overwrite
 # return back to original dir
 cd -
+# flush the caches
+sync
+# wait a bit to really write everything to disk (see "man sync")
+sleep 3
 EOF
 
       File.write(script_path, script_content)