Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-16 05:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge xenial-sru-grub into ubuntu/xenial [a=powersj] [r=patviafore,rcj]

Browse Source 
SRU always install grub-pc with shim-signed (LP: #1901906), and ensure to autoremove packages

MP: https://code.launchpad.net/~powersj/livecd-rootfs/+git/livecd-rootfs-1/+merge/393733
This commit is contained in:
Robert C Jennings 2020-11-20 15:26:53 -06:00
commit 98238df82a
No known key found for this signature in database
GPG Key ID: 740C3D9EEDF2ED73
6 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -1,5 +1,9 @@
livecd-rootfs (2.408.62) UNRELEASED; urgency=medium livecd-rootfs (2.408.62) UNRELEASED; urgency=medium
[ Dimitri John Ledkov & Joshua Powers ]
* amd64: always install grub-pc with shim-signed (LP: #1901906), and
ensure to autoremove packages
[ Patrick Viafore ] [ Patrick Viafore ]
* Increase Vagrant disk size from 10G to 40G (LP: #1580596) * Increase Vagrant disk size from 10G to 40G (LP: #1580596)

3
live-build/auto/config
View File

@ -501,8 +501,7 @@ case $PROJECT in
add_package install grub-pc add_package install grub-pc
;; ;;
amd64) amd64)
add_package install grub-pc-bin add_package install grub-pc
add_package install grub-efi-amd64-signed
add_package install shim-signed add_package install shim-signed
;; ;;
armhf) armhf)

1
live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary
View File

@ -33,6 +33,7 @@ install_grub() {
chroot mountpoint apt-get -qqy update chroot mountpoint apt-get -qqy update
chroot mountpoint apt-get -qqy install grub2 chroot mountpoint apt-get -qqy install grub2
chroot mountpoint apt-get -qqy remove --purge grub-legacy-ec2 chroot mountpoint apt-get -qqy remove --purge grub-legacy-ec2
chroot mountpoint apt-get autoremove --purge --assume-yes
# set the kernel commandline to use hvc0 # set the kernel commandline to use hvc0
mkdir -p mountpoint/etc/default/grub.d mkdir -p mountpoint/etc/default/grub.d

4
live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
View File

@ -86,12 +86,14 @@ install_grub() {
efi_target=arm64-efi efi_target=arm64-efi
;; ;;
amd64) amd64)
chroot mountpoint apt-get install -qqy grub-efi-amd64-signed grub-efi-amd64 shim-signed chroot mountpoint apt-get install -qqy grub-pc shim-signed
grub_modules="multiboot serial usb usb_keyboard" grub_modules="multiboot serial usb usb_keyboard"
efi_target=x86_64-efi efi_target=x86_64-efi
;; ;;
esac esac
chroot mountpoint apt-get autoremove --purge --assume-yes
cat << EOF >> mountpoint/etc/default/grub.d/50-cloudimg-settings.cfg cat << EOF >> mountpoint/etc/default/grub.d/50-cloudimg-settings.cfg
${IMAGE_STR} ${IMAGE_STR}
# For Cloud Image compatability # For Cloud Image compatability

1
live-build/ubuntu-cpc/hooks.d/base/disk-image.binary
View File

@ -132,6 +132,7 @@ fi
if [ "$ARCH" = "s390x" ]; then if [ "$ARCH" = "s390x" ]; then
# Do ZIPL install bits # Do ZIPL install bits
chroot mountpoint apt-get -qqy install s390-tools sysconfig-hardware chroot mountpoint apt-get -qqy install s390-tools sysconfig-hardware
chroot mountpoint apt-get autoremove --purge --assume-yes
# Write out cloudy zipl.conf for future kernel updates # Write out cloudy zipl.conf for future kernel updates
cat << EOF > mountpoint/etc/zipl.conf cat << EOF > mountpoint/etc/zipl.conf

1
live-build/ubuntu-cpc/hooks.d/base/wsl-gz.binary
View File

@ -35,6 +35,7 @@ cp -a binary/boot/filesystem.dir/ $rootfs_dir
setup_mountpoint $rootfs_dir setup_mountpoint $rootfs_dir
env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get -y -qq install ubuntu-wsl env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get -y -qq install ubuntu-wsl
env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get autoremove --purge --assume-yes
create_manifest $rootfs_dir livecd.ubuntu-cpc.wsl.rootfs.manifest create_manifest $rootfs_dir livecd.ubuntu-cpc.wsl.rootfs.manifest
teardown_mountpoint $rootfs_dir teardown_mountpoint $rootfs_dir