From e23685134e89008d7f43e51d9d2c0354c421cf7a Mon Sep 17 00:00:00 2001 From: Cody Shepherd Date: Fri, 10 Jul 2020 09:58:47 -0700 Subject: [PATCH] * Remove explicit install of grub-efi* packages for amd64 * Remove systemd-networkd artifacts from includes.chroot --- live-build/buildd/hooks/02-disk-image-uefi.binary | 2 +- .../system/multi-user.target.wants/systemd-networkd.service | 1 - .../systemd-networkd-wait-online.service | 1 - .../systemd/system/sockets.target.wants/systemd-networkd.socket | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) delete mode 120000 live-build/buildd/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service delete mode 120000 live-build/buildd/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service delete mode 120000 live-build/buildd/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket diff --git a/live-build/buildd/hooks/02-disk-image-uefi.binary b/live-build/buildd/hooks/02-disk-image-uefi.binary index 4339abe6..35208c7a 100755 --- a/live-build/buildd/hooks/02-disk-image-uefi.binary +++ b/live-build/buildd/hooks/02-disk-image-uefi.binary @@ -84,7 +84,7 @@ install_grub() { ;; amd64) chroot mountpoint apt-get install -qqy grub-pc - chroot mountpoint apt-get install -qqy grub-efi-amd64-signed grub-efi-amd64 shim-signed + chroot mountpoint apt-get install -qqy shim-signed grub_modules="multiboot serial usb usb_keyboard" efi_target=x86_64-efi ;; diff --git a/live-build/buildd/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service b/live-build/buildd/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service deleted file mode 120000 index 3c55b243..00000000 --- a/live-build/buildd/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service +++ /dev/null @@ -1 +0,0 @@ -/lib/systemd/system/systemd-networkd.service \ No newline at end of file diff --git a/live-build/buildd/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service b/live-build/buildd/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service deleted file mode 120000 index 3b627c5c..00000000 --- a/live-build/buildd/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service +++ /dev/null @@ -1 +0,0 @@ -/lib/systemd/system/systemd-networkd-wait-online.service \ No newline at end of file diff --git a/live-build/buildd/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket b/live-build/buildd/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket deleted file mode 120000 index bcfcdbac..00000000 --- a/live-build/buildd/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket +++ /dev/null @@ -1 +0,0 @@ -/lib/systemd/system/systemd-networkd.socket \ No newline at end of file