From 0a803e95cc9f0ff9b5e80bfeb9ea1d8d2b686266 Mon Sep 17 00:00:00 2001 From: jfliu Date: Fri, 28 Jul 2023 13:04:59 +0800 Subject: [PATCH] add gparted, generate ssh key in live --- .github/workflows/build.yml | 2 +- additional-packages.bookworm | 1 + ...l-grub-efi-arm64.hook.chroot => customize-chroot.hook.chroot | 2 ++ lb-config-bookworm.sh | 2 +- lb-config-jammy.sh | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) rename 0001-install-grub-efi-arm64.hook.chroot => customize-chroot.hook.chroot (94%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1cd92ad..158d35a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,7 +68,7 @@ jobs: cp ../lb-config-${{ matrix.CODENAME }}.sh lb-config.sh cp ../additional-packages.${{ matrix.CODENAME }} additional-packages cp ../networkmanager.yaml . - cp ../0001-install-grub-efi-arm64.hook.chroot . + cp ../customize-chroot.hook.chroot . cp ../10_linux . chmod +x lb-config.sh ./lb-config.sh diff --git a/additional-packages.bookworm b/additional-packages.bookworm index 0136eb1..04a5a5a 100644 --- a/additional-packages.bookworm +++ b/additional-packages.bookworm @@ -3,3 +3,4 @@ mesa-utils vim calamares-settings-debian grub-efi-arm64 +gparted diff --git a/0001-install-grub-efi-arm64.hook.chroot b/customize-chroot.hook.chroot similarity index 94% rename from 0001-install-grub-efi-arm64.hook.chroot rename to customize-chroot.hook.chroot index 1c13a10..7e0fee5 100755 --- a/0001-install-grub-efi-arm64.hook.chroot +++ b/customize-chroot.hook.chroot @@ -7,3 +7,5 @@ then sed -i "s|grub-efi-amd64|grub-efi-arm64|g" /usr/sbin/bootloader-config sed -i "s|installEFIFallback: false|installEFIFallback: true|g" /etc/calamares/modules/bootloader.conf fi + +ssh-keygen -A diff --git a/lb-config-bookworm.sh b/lb-config-bookworm.sh index 523ca49..d3e999e 100755 --- a/lb-config-bookworm.sh +++ b/lb-config-bookworm.sh @@ -48,6 +48,6 @@ cp additional-packages config/package-lists/additional-packages.list.chroot mkdir -p config/includes.chroot_after_packages/etc/netplan cp networkmanager.yaml config/includes.chroot_after_packages/etc/netplan -cp 0001-install-grub-efi-arm64.hook.chroot config/hooks/live +cp customize-chroot.hook.chroot config/hooks/live mkdir -p config/includes.chroot_after_packages/etc/grub.d/ cp 10_linux config/includes.chroot_after_packages/etc/grub.d/ diff --git a/lb-config-jammy.sh b/lb-config-jammy.sh index 62d9479..4502f2d 100755 --- a/lb-config-jammy.sh +++ b/lb-config-jammy.sh @@ -47,4 +47,4 @@ cp additional-packages config/package-lists/additional-packages.list.chroot mkdir -p config/includes.chroot_after_packages/etc/netplan cp networkmanager.yaml config/includes.chroot_after_packages/etc/netplan -cp 0001-install-grub-efi-arm64.hook.chroot config/hooks/live +cp customize-chroot.hook.chroot config/hooks/live