From 0fdb59b0d1704d735c607581b08a1c008a0a5617 Mon Sep 17 00:00:00 2001
From: Mads Kiilerich <mads@kiilerich.com>
Date: Thu, 5 Apr 2012 02:19:50 +0200
Subject: [PATCH] drop 90_persistent script

It is undocumented.

It haven't been upstreamed.

Upstream has 40_custom and 41_custom for the same purpose.

It violates layering and code structure by guessing which (optional!) output
file has been specified for grub2-mkconfig ... and makes the wrong guess for
grub2-efi.
---
 90_persistent | 36 ------------------------------------
 grub2.spec    |  4 ----
 2 files changed, 40 deletions(-)
 delete mode 100644 90_persistent

diff --git a/90_persistent b/90_persistent
deleted file mode 100644
index 634b177a..00000000
--- a/90_persistent
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh -e
-
-# update-grub helper script.
-# Copyright (C) 2008  Free Software Foundation, Inc.
-#
-# GRUB is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# GRUB is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-
-# The output of this script is copied from part of grub.cfg
-# that correspond to itself. The achievement is that user can
-# modify that part of grub.cfg directly, and it will be persistent
-# across update-grub runs.
-
-transform="s&^&&;s,grub,grub2,"
-ME=$(echo $0 |sed 's,/,\\/,g')
-GRUBCFG=/boot/`echo grub | sed ${transform}`/grub.cfg
-
-# Exit gracefully if there's no configuration file yet
-[ -f ${GRUBCFG} ] || exit 0
-
-awk "
-	BEGIN {echo = 0}
-	/### BEGIN $ME ###/ {echo = 1; next}
-	/### END $ME ###/ {echo = 0; next}
-	{if (echo) print}
-" ${GRUBCFG}
diff --git a/grub2.spec b/grub2.spec
index b1497efe..40ce7d96 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -30,7 +30,6 @@ License:        GPLv3+
 URL:            http://www.gnu.org/software/grub/
 Obsoletes:	grub < 1:0.98
 Source0:        ftp://alpha.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz
-Source1:        90_persistent
 Source2:        grub.default
 Source3:        README.Fedora
 Source4:	http://unifoundry.com/unifont-5.1.20080820.pcf.gz
@@ -212,9 +211,6 @@ cd ..
 cd grub-%{tarversion}
 make DESTDIR=$RPM_BUILD_ROOT install
 
-# Script that makes part of grub.cfg persist across updates
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/
-
 # Ghost config file
 install -d $RPM_BUILD_ROOT/boot/%{name}
 touch $RPM_BUILD_ROOT/boot/%{name}/grub.cfg