* util/grub-mkconfig.in: Use 'set -e' rather than '#! /bin/sh -e',

to avoid accidents when debugging with 'sh -x'.
* util/grub-mkrescue.in: Likewise.
* util/grub.d/00_header.in: Likewise.
* util/grub.d/10_hurd.in: Likewise.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.
* util/grub.d/10_netbsd.in: Likewise.
* util/grub.d/10_windows.in: Likewise.
* util/grub.d/20_linux_xen.in: Likewise.
* util/grub.d/30_os-prober.in: Likewise.
* util/powerpc/ieee1275/grub-mkrescue.in: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 54880f44f6eaf0b73684fbc3aa26583ace4dd6e1..f5988e08c29b3b4c4ecc241f010a68e8c740cf6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-06-29  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/grub-mkconfig.in: Use 'set -e' rather than '#! /bin/sh -e',
+       to avoid accidents when debugging with 'sh -x'.
+       * util/grub-mkrescue.in: Likewise.
+       * util/grub.d/00_header.in: Likewise.
+       * util/grub.d/10_hurd.in: Likewise.
+       * util/grub.d/10_kfreebsd.in: Likewise.
+       * util/grub.d/10_linux.in: Likewise.
+       * util/grub.d/10_netbsd.in: Likewise.
+       * util/grub.d/10_windows.in: Likewise.
+       * util/grub.d/20_linux_xen.in: Likewise.
+       * util/grub.d/30_os-prober.in: Likewise.
+       * util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
+
 2010-06-29  Colin Watson  <cjwatson@ubuntu.com>
 
        * commands/cat.c (grub_cmd_cat): Fix buffer overrun if '\r' is the

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index e417b4352a85b03624298af11730febb074b6f8e..828b54bce0b8e81e5c8e69559d3e449c36124eb8 100644 (file)
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # Generate grub.cfg by inspecting /boot contents.
 # Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc.

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 36cce31ecb3b57901ca491004aa2e748076cff0f..4a16558e4d304569f42456b3cfa10dc13d676455 100644 (file)
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # Make GRUB rescue image
 # Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.

diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 8186ffd2d6c1d5f71d92da2a6b86b053c8e263c0..553369e37b83aa5809ab619b50223793324d73eb 100644 (file)
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # grub-mkconfig helper script.
 # Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.

diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index e446f10e8a01d3573f8c0d29cbf6f184dcee57a6..350eb30a8a0057b5b1c8bf9f524381a325a05a3e 100644 (file)
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # grub-mkconfig helper script.
 # Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.

diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index f63421617eba4aa8915a90e8f7797d247e4d0449..9915abdf12e0f674dac952c2f885b1a27536d7d4 100644 (file)
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # grub-mkconfig helper script.
 # Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 9e1450f51062aa71b3283a73fd14ebd684461e5a..57bc1eebc17d302ec2933206aa7237caba82b114 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # grub-mkconfig helper script.
 # Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.

diff --git a/util/grub.d/10_netbsd.in b/util/grub.d/10_netbsd.in
index 7e5fb34adf0fd81388e8a4f429311b9037a81723..1a8c4eb36e9b1c7c65b7dd401f9b228de1f176ff 100644 (file)
--- a/util/grub.d/10_netbsd.in
+++ b/util/grub.d/10_netbsd.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # grub-mkconfig helper script.
 # Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.

diff --git a/util/grub.d/10_windows.in b/util/grub.d/10_windows.in
index 7d221eac9bd0941c99be5be311bde1073ad58f6c..fd068dd2dec4a4e89d8c5b3030a09dfa9b512972 100644 (file)
--- a/util/grub.d/10_windows.in
+++ b/util/grub.d/10_windows.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # grub-mkconfig helper script.
 # Copyright (C) 2008,2009,2010  Free Software Foundation, Inc.

diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index 9a0136a7642dceebbefe5d632f07dd71b55e6065..8612c96b0fa8bff75ecc050c968124adf4c8e828 100644 (file)
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # grub-mkconfig helper script.
 # Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.

diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index 90e2e3d9293daaa63d80247f72c5601757793a7d..601663dcce44b38ad34b37dee42fffc2af6b20f0 100644 (file)
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # grub-mkconfig helper script.
 # Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.

diff --git a/util/powerpc/ieee1275/grub-mkrescue.in b/util/powerpc/ieee1275/grub-mkrescue.in
index 4ef26f616c779b94ab7166a67760498c287ab1f7..aefedff3f937b10035c07e196a1ddbc30ecc256a 100644 (file)
--- a/util/powerpc/ieee1275/grub-mkrescue.in
+++ b/util/powerpc/ieee1275/grub-mkrescue.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # Make GRUB rescue image
 # Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008  Free Software Foundation, Inc.