From 78fe4394c10e83306ba6e3016aaa0416373d41cc Mon Sep 17 00:00:00 2001 From: Cody Shepherd Date: Wed, 19 Aug 2020 09:46:36 -0700 Subject: [PATCH 1/2] Install grub-legacy-ec2 for all ubuntu-cpc (LP #1888575) --- live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot index 56b6950c..b5a8ecd2 100755 --- a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot @@ -166,6 +166,10 @@ if [ "${SUBPROJECT:-}" = minimized ]; then _xchroot "${rootd}" apt clean fi +# install grub-legacy-ec2 and ubuntu-server for all ubuntu-cpc for LP: #1888575 +_xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \ + apt-get -y install --no-install-recommends grub-legacy-ec2 ubuntu-server + #### END COMMON ARCH FUNCTIONS From c279a93b1be5e2b48c4c408234c64b411ae7cb9d Mon Sep 17 00:00:00 2001 From: Cody Shepherd Date: Wed, 16 Sep 2020 13:00:55 -0600 Subject: [PATCH 2/2] Omit --no-install-recommends flag and ubuntu-server from install --- live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot index b5a8ecd2..2beed251 100755 --- a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot @@ -168,7 +168,7 @@ fi # install grub-legacy-ec2 and ubuntu-server for all ubuntu-cpc for LP: #1888575 _xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \ - apt-get -y install --no-install-recommends grub-legacy-ec2 ubuntu-server + apt-get -y install grub-legacy-ec2 #### END COMMON ARCH FUNCTIONS