On 11/06/2017 10:45 AM, Frank Scheiner wrote:
> 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.

Please rephrase to:

 "Query force-efi-extra-removable only when installing grub-efi*"

both in the commit message and the changelog entry.

> + -- Frank Scheiner <frank.schei...@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*)

Please rather match with "$ARCH:$grub_package", i.e.:

case $ARCH:$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
Looks fine otherwise.

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaub...@debian.org
`. `'   Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

Reply via email to