[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH 2/2] Execute EFI related code only for installations of grub-efi* packages.



---
 debian/changelog |  7 +++++++
 grub-installer   | 30 +++++++++++++++++-------------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1880d5b..0470484 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grub-installer (1.147) UNRELEASED; urgency=medium
+
+  [ Frank Scheiner ]
+  * Execute EFI related code only for installations of grub-efi* packages.
+
+ -- Frank Scheiner <frank.scheiner@web.de>  Thu, 31 Oct 2017 20:08:00 +0200
+
 grub-installer (1.146) unstable; urgency=medium
 
   [ Updated translations ]
diff --git a/grub-installer b/grub-installer
index 192be53..a45b616 100755
--- a/grub-installer
+++ b/grub-installer
@@ -831,19 +831,23 @@ if [ -z "$frdisk" ]; then
 			fi
 		fi
 
-		# Should we force a copy of grub-efi to be installed
-		# to the removable media path too? Ask at low
-		# priority, or can also be pre-seeded of course
-		db_input low grub-installer/force-efi-extra-removable || [ $? -eq 30 ]
-		db_go || exit 10
-		db_get grub-installer/force-efi-extra-removable
-		if [ "$RET" = true ]; then
-			grub_install_params="$grub_install_params --force-extra-removable"
-			# Make sure this happens on upgrades too
-			$chroot $ROOT 'debconf-set-selections' <<EOF
-$grub_package grub2/force_efi_extra_removable boolean true
-EOF
-		fi
+		case $grub_package in
+		    grub-efi*)
+			# Should we force a copy of grub-efi to be installed
+			# to the removable media path too? Ask at low
+			# priority, or can also be pre-seeded of course
+			db_input low grub-installer/force-efi-extra-removable || [ $? -eq 30 ]
+			db_go || exit 10
+			db_get grub-installer/force-efi-extra-removable
+			if [ "$RET" = true ]; then
+				grub_install_params="$grub_install_params --force-extra-removable"
+				# Make sure this happens on upgrades too
+				$chroot $ROOT 'debconf-set-selections' <<-EOF
+					$grub_package grub2/force_efi_extra_removable boolean true
+				EOF
+			fi
+			;;
+		esac
 
 		case $ARCH in
 		    powerpc/chrp_pegasos)
-- 
1.9.1


Reply to: