dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0201-ppc64le-has-no-separate-boot-mount-1261926.patch

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