From 1cc82c32c6e36cde2313c173ccae9b312d2575ff Mon Sep 17 00:00:00 2001
From: Sunderland93 <samoilov.lex@gmail.com>
Date: Wed, 2 Nov 2022 15:31:23 +0400
Subject: [PATCH] Remove binary packages pool from ISO

---
 etc/auto/config                                |  2 +-
 .../hooks/live/generate-dist-release.binary    | 15 ---------------
 .../package-lists.calamares/pool.list.binary   | 18 ------------------
 3 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 etc/config/hooks/live/generate-dist-release.binary
 delete mode 100644 etc/config/package-lists.calamares/pool.list.binary

diff --git a/etc/auto/config b/etc/auto/config
index 7d06421..c77dcb1 100755
--- a/etc/auto/config
+++ b/etc/auto/config
@@ -45,7 +45,7 @@ lb config noauto \
     --zsync false \
     --security true \
     --updates true \
-    --debootstrap-options "--include=ca-certificates --variant=minbase" \
+    --debootstrap-options "--include=ca-certificates,systemd" \
     "${@}"
 
 # replace channel and suite
diff --git a/etc/config/hooks/live/generate-dist-release.binary b/etc/config/hooks/live/generate-dist-release.binary
deleted file mode 100644
index cfe3b92..0000000
--- a/etc/config/hooks/live/generate-dist-release.binary
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-apt-ftparchive \
--o "APT::FTPArchive::Release::Acquire-By-Hash=yes" \
--o "APT::FTPArchive::Release::Architectures=amd64" \
--o "APT::FTPArchive::Release::Codename=$CODENAME" \
--o "APT::FTPArchive::Release::Components=main restricted non-free" \
--o "APT::FTPArchive::Release::Description=Ubuntu $CODENAME $VERSION" \
--o "APT::FTPArchive::Release::Label=Ubuntu" \
--o "APT::FTPArchive::Release::Origin=Ubuntu" \
--o "APT::FTPArchive::Release::Suite=$CODENAME" \
--o "APT::FTPArchive::Release::Version=$VERSION" release "dists/$CODENAME" \
-> dists/$CODENAME/Release
-
-# gpg --batch --yes --digest-algo sha512 --sign --detach-sign -u 0x65A0FEF800E0F671DA40A0AD0CCCDBF527989837 --armor -o "dists/$CODENAME/Release.gpg" "dists/$CODENAME/Release"
diff --git a/etc/config/package-lists.calamares/pool.list.binary b/etc/config/package-lists.calamares/pool.list.binary
deleted file mode 100644
index 7873576..0000000
--- a/etc/config/package-lists.calamares/pool.list.binary
+++ /dev/null
@@ -1,18 +0,0 @@
-b43-fwcutter
-bcmwl-kernel-source
-dkms
-intel-microcode
-iucode-tool
-setserial
-user-setup
-
-efibootmgr
-secureboot-db
-
-#if ARCHITECTURES amd64
-grub-efi-amd64
-grub-efi-amd64-bin
-grub-efi-amd64-signed
-shim
-shim-signed
-#endif