From ef096628225bd8b2ef6a8c18fd4743f5fdbfe8f6 Mon Sep 17 00:00:00 2001
From: Daniel Reichelt <debian@nachtgeist.net>
Date: Sun, 30 Oct 2016 20:23:40 +0100
Subject: [PATCH] Fix inconsistent handling of --nopygrub parameter

Closes: https://bugs.debian.org/842609
---
 hooks/common/80-install-modules-deb | 2 +-
 hooks/common/82-install-grub-legacy | 2 +-
 hooks/debian/80-install-kernel      | 2 +-
 hooks/edgy/80-install-kernel        | 2 +-
 hooks/intrepid/80-install-kernel    | 2 +-
 hooks/karmic/80-install-kernel      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hooks/common/80-install-modules-deb b/hooks/common/80-install-modules-deb
index d8a4d1f..ff5fc3b 100755
--- a/hooks/common/80-install-modules-deb
+++ b/hooks/common/80-install-modules-deb
@@ -31,7 +31,7 @@ fi
 #
 logMessage Script $0 starting
 
-if [ ${pygrub} ]; then
+if [ "${pygrub}" = "1" ]; then
     logMessage "pygrub set, skipping module install"
 else
 #
diff --git a/hooks/common/82-install-grub-legacy b/hooks/common/82-install-grub-legacy
index 5f66da2..8efbea8 100755
--- a/hooks/common/82-install-grub-legacy
+++ b/hooks/common/82-install-grub-legacy
@@ -26,7 +26,7 @@ fi
 #
 logMessage Script $0 starting
 
-if [ ${pygrub} ]; then
+if [ "${pygrub}" = "1" ]; then
 
 #
 #  Install the grub 0.9x package ("grub-legacy" on Debian, "grub" on Ubuntu)
diff --git a/hooks/debian/80-install-kernel b/hooks/debian/80-install-kernel
index 90a9f57..bb01d25 100755
--- a/hooks/debian/80-install-kernel
+++ b/hooks/debian/80-install-kernel
@@ -21,7 +21,7 @@ else
     . ./hooks/common.sh
 fi
 
-if [ "${pygrub}" ]; then
+if [ "${pygrub}" = "1" ]; then
 #
 # Log our start
 #
diff --git a/hooks/edgy/80-install-kernel b/hooks/edgy/80-install-kernel
index 5bc8032..f925156 100755
--- a/hooks/edgy/80-install-kernel
+++ b/hooks/edgy/80-install-kernel
@@ -27,7 +27,7 @@ fi
 
 logMessage Script $0 starting
 
-if [ "${pygrub}" ]; then
+if [ "${pygrub}" = "1" ]; then
 
 #
 # Attempt to install a xen kernel, if that fails, then install a normal one
diff --git a/hooks/intrepid/80-install-kernel b/hooks/intrepid/80-install-kernel
index c6bd726..3e7d2d7 100755
--- a/hooks/intrepid/80-install-kernel
+++ b/hooks/intrepid/80-install-kernel
@@ -27,7 +27,7 @@ fi
 
 logMessage Script $0 starting
 
-if [ "${pygrub}" ]; then
+if [ "${pygrub}" = "1" ]; then
 
 #
 # Attempt to install a xen kernel, if that fails, then install a normal one
diff --git a/hooks/karmic/80-install-kernel b/hooks/karmic/80-install-kernel
index 7252131..06b2fd1 100755
--- a/hooks/karmic/80-install-kernel
+++ b/hooks/karmic/80-install-kernel
@@ -26,7 +26,7 @@ fi
 
 logMessage Script $0 starting
 
-if [ "${pygrub}" ]; then
+if [ "${pygrub}" = "1" ]; then
 
 #
 # The type of kernel that we will be installing