[grub2] remove check for serial.mod in 00_header

Brian C. Lane bcl at fedoraproject.org
Fri Mar 9 20:59:48 UTC 2012


commit 2b9af11d18512e5f747d2596894837d8150241a1
Author: Brian C. Lane <bcl at redhat.com>
Date:   Fri Mar 9 09:09:16 2012 -0800

    remove check for serial.mod in 00_header

 ...ove-serial.mod-test-from-00_header-748964.patch |   29 ++++++++++++++++++++
 grub2.spec                                         |    1 +
 2 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/grub2-1.99-remove-serial.mod-test-from-00_header-748964.patch b/grub2-1.99-remove-serial.mod-test-from-00_header-748964.patch
new file mode 100644
index 0000000..918d559
--- /dev/null
+++ b/grub2-1.99-remove-serial.mod-test-from-00_header-748964.patch
@@ -0,0 +1,29 @@
+From fa200c2b59c0b8346466b503cd6ac80e331c9277 Mon Sep 17 00:00:00 2001
+From: Fedora Ninjas <pjones at fedoraproject.org>
+Date: Thu, 8 Mar 2012 13:43:39 -0800
+Subject: [GRUB2] remove serial.mod test from 00_header (#748964)
+
+This test doesn't belong here, upstream has removed it, and it
+was blocking serial installs from working.
+---
+ util/grub.d/00_header.in |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
+index 5c4d9db..a1a75aa 100644
+--- a/util/grub.d/00_header.in
++++ b/util/grub.d/00_header.in
+@@ -113,10 +113,6 @@ for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
+ done
+ 
+ if [ "x$serial" = x1 ]; then
+-    if ! test -e "${GRUB_PREFIX}/serial.mod" ; then
+-	echo "Serial terminal not available on this platform." >&2 ; exit 1
+-    fi
+-
+     if [ "x${GRUB_SERIAL_COMMAND}" = "x" ] ; then
+ 	grub_warn "Requested serial terminal but GRUB_SERIAL_COMMAND is unspecified. Default parameters will be used."
+ 	GRUB_SERIAL_COMMAND=serial
+-- 
+1.7.7.6
+
diff --git a/grub2.spec b/grub2.spec
index edd8918..1f6b01c 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -40,6 +40,7 @@ Patch6:		grub2-gfxpayload-efi.patch
 Patch7:		grub-1.99-fix_grub-probe_call.patch
 Patch8:		grub-1.99-handle-newer-autotools.patch
 Patch9:		grub-1.99-gcc-4.7.0.patch
+Patch10:        grub2-1.99-remove-serial.mod-test-from-00_header-748964.patch
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


More information about the scm-commits mailing list