nalika / rpms / grub2

Forked from rpms/grub2 2 years ago
Clone
28f7f8
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
23d2ea
From: Robert Marshall <rmarshall@redhat.com>
23d2ea
Date: Fri, 17 Jun 2016 11:47:34 -0400
28f7f8
Subject: [PATCH] ppc64le has no separate /boot mount (#1261926)
23d2ea
23d2ea
The patch for rhbz#1212114 ensures that ppc64le systems sync grub config
23d2ea
changes to disk prior to grub-mkconfig completion and a reboot.
23d2ea
23d2ea
This patch required checking for /boot as its own mount point because
23d2ea
issuing fsfreeze to a root partition is unwise. For administrators who
23d2ea
configured a ppc64le system with no separate /boot partition, the failed
23d2ea
check results in an error message. The file is written and would work
23d2ea
most of the time, however, it also introduces a corner case where the
23d2ea
behavior manifested in rhbz#1212114 could re-appear on these systems.
23d2ea
23d2ea
The system call issued by fsfreeeze is being issued by methods within
23d2ea
the anaconda installer and can be removed from GRUB proper.
23d2ea
23d2ea
Related: rhbz#1315468
23d2ea
Resolves: rhbz#1261926
23d2ea
---
23d2ea
 util/grub-mkconfig.in | 9 ---------
23d2ea
 1 file changed, 9 deletions(-)
23d2ea
23d2ea
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
28f7f8
index 7db89499949..0cfe6047539 100644
23d2ea
--- a/util/grub-mkconfig.in
23d2ea
+++ b/util/grub-mkconfig.in
23d2ea
@@ -291,12 +291,3 @@ fi
23d2ea
 
23d2ea
 gettext "done" >&2
23d2ea
 echo >&2
23d2ea
-
23d2ea
-# make sure changes make it to the disk.
23d2ea
-# if /boot is a mountpoint, force the meta data on disk
23d2ea
-# to by-pass writeback delay.
23d2ea
-# PPC64LE-only to deal with Petitboot issues
23d2ea
-ARCH=$(uname -m)
23d2ea
-if [ "${ARCH}" = "ppc64le" ]; then
23d2ea
-    sync && mountpoint -q /boot &&fsfreeze -f /boot && fsfreeze -u /boot
23d2ea
-fi