diff --git a/bootloader-config-32bit/bootloader-config b/bootloader-config-32bit/bootloader-config deleted file mode 100755 index 0dbae957..00000000 --- a/bootloader-config-32bit/bootloader-config +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") - -# Set secure permissions for the initramfs if we're configuring -# full-disk-encryption. The initramfs is re-generated later in the -# installation process so we only set the permissions snippet without -# regenerating the initramfs right now: -if [ "$(mount | grep $CHROOT" " | cut -c -16)" = "/dev/mapper/luks" ]; then - echo "UMASK=0077" > $CHROOT/etc/initramfs-tools/conf.d/initramfs-permissions -fi - -echo "Running bootloader-config..." - -if [ -d /sys/firmware/efi/efivars ]; then - echo " * Installing grub-efi (uefi)..." - DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-ia32 cryptsetup keyutils -else - echo " * install grub... (bios)" - DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc cryptsetup keyutils -fi diff --git a/build.sh b/build.sh index 3d5eb6a6..325aba62 100755 --- a/build.sh +++ b/build.sh @@ -35,7 +35,6 @@ lb config noauto \ --security true \ --cache true \ --apt-recommends true \ - --apt-options "--yes -oAcquire::allow-remove-essential=true" \ --firmware-binary true \ --firmware-chroot true \ --iso-application "My-distro" \