dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

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

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