~ubuntu-branches/debian/jessie/grub/jessie

« back to all changes in this revision

Viewing changes to debian/patches/xfs_freeze.diff

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-03-17 13:34:14 UTC
  • Revision ID: james.westby@ubuntu.com-20110317133414-cawa48d482iuqqb9
Tags: 0.97-65
* Fix grub/migrate_from_legacy title to not end with a full stop.
* Fix update-grub(8) groff typo (".bar" instead of ".br").
* Adjust doc-base file to account for renaming of grub.info to
  grub-legacy.info.
* Compare -trunk kernels earlier than numeric ABIs (thanks, Aaron M. Ucko
  and Andreas Beckmann; closes: #570318).
* Convert from home-grown patch system to quilt.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
diff -ur grub-0.97.old/util/grub-install.in grub-0.97/util/grub-install.in
2
 
--- grub-0.97.old/util/grub-install.in  2004-07-24 20:57:31.000000000 +0200
3
 
+++ grub-0.97/util/grub-install.in      2009-01-16 22:15:46.000000000 +0100
4
 
@@ -422,6 +422,17 @@
5
 
 test -n "$mkimg" && img_file=`$mkimg`
6
 
 test -n "$mklog" && log_file=`$mklog`
7
 
 
8
 
+# GRUB will try to verify that stage2 is accessible using its own
9
 
+# filesystem drivers.  Make sure it's committed to disk.
10
 
+sync
11
 
+
12
 
+# On XFS, sync() is not enough.
13
 
+if [ x"`grub-probe --device-map=${device_map} -t fs ${grubdir}`" = "xxfs" ] ; then
14
 
+  xfs_freeze -f ${grubdir} && xfs_freeze -u ${grubdir}
15
 
+  # We don't have set -e.  If xfs_freeze failed, it's worth trying anyway,
16
 
+  # maybe we're lucky.
17
 
+fi
18
 
+
19
 
 for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
20
 
     count=5
21
 
     tmp=`echo $file | sed "s|^${grubdir}|${grub_prefix}|"`