Re: [PATCH v2 2/2] Query force-efi-extra-removable only when installing, grub-efi*
On 11/16/2017 08:01 AM, Frank Scheiner wrote:
> ---
> debian/changelog | 7 +++++++
> grub-installer | 30 +++++++++++++++++-------------
> 2 files changed, 24 insertions(+), 13 deletions(-)
>
> diff --git a/debian/changelog b/debian/changelog
> index 1880d5b..c69b48e 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,10 @@
> +grub-installer (1.147) UNRELEASED; urgency=medium
> +
> + [ Frank Scheiner ]
> + * Query force-efi-extra-removable only when installing grub-efi*
> +
> + -- Frank Scheiner <frank.scheiner@web.de> Thu, 16 Nov 2017 07:20:38 +0100
> +
> grub-installer (1.146) unstable; urgency=medium
>
> [ Updated translations ]
> diff --git a/grub-installer b/grub-installer
> index 192be53..c433388 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 $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
>
> case $ARCH in
> powerpc/chrp_pegasos)
>
Applied to local tree.
I'm waiting for the remaining 5 patches before pushing everything.
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer - glaubitz@debian.org
`. `' Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Reply to: