fix i386 multiarch support

This commit is contained in:
ading2210 2023-12-14 17:05:18 +00:00
parent 58faaa5b1d
commit e01971d803
2 changed files with 10 additions and 6 deletions

View File

@ -89,7 +89,7 @@ patch_initramfs $initramfs_dir
echo "creating disk image" echo "creating disk image"
rootfs_size=$(du -sm $rootfs_dir | cut -f 1) rootfs_size=$(du -sm $rootfs_dir | cut -f 1)
rootfs_part_size=$(($rootfs_size * 11 / 10)) rootfs_part_size=$(($rootfs_size * 12 / 10))
#create a 20mb bootloader partition #create a 20mb bootloader partition
#rootfs partition is 20% larger than its contents #rootfs partition is 20% larger than its contents
create_image $output_path 20 $rootfs_part_size create_image $output_path 20 $rootfs_part_size

View File

@ -10,7 +10,7 @@ fi
custom_repo="https://shimboot.ading.dev/debian" custom_repo="https://shimboot.ading.dev/debian"
custom_repo_domain="shimboot.ading.dev" custom_repo_domain="shimboot.ading.dev"
sources_entry="deb [trusted=yes] ${custom_repo} ${release_name} main" sources_entry="deb [trusted=yes arch=amd64] ${custom_repo} ${release_name} main"
#add shimboot repos #add shimboot repos
echo -e "${sources_entry}\n$(cat /etc/apt/sources.list)" > /etc/apt/sources.list echo -e "${sources_entry}\n$(cat /etc/apt/sources.list)" > /etc/apt/sources.list
@ -23,13 +23,13 @@ END
#install the patched systemd #install the patched systemd
apt-get install -y ca-certificates apt-get install -y ca-certificates
apt-get update apt-get update
apt-get upgrade -y apt-get upgrade -y --allow-downgrades
#enable shimboot services #enable shimboot services
systemctl enable kill-frecon.service systemctl enable kill-frecon.service
#install desktop #install desktop
apt-get install -y task-xfce-desktop cloud-utils zram-tools apt-get install -y task-xfce-desktop cloud-utils zram-tools --allow-downgrades
#set up zram #set up zram
tee -a /etc/default/zramswap << END tee -a /etc/default/zramswap << END
@ -51,12 +51,16 @@ ff02::2 ip6-allrouters
END END
echo "Enter a root password:" echo "Enter a root password:"
passwd root while ! passwd root; do
echo "Failed to set password, please try again."
done
read -p "Enter the username for the user account: " username read -p "Enter the username for the user account: " username
useradd -m -s /bin/bash -G sudo $username useradd -m -s /bin/bash -G sudo $username
echo "Enter the password for ${username}:" echo "Enter the password for ${username}:"
passwd $username while ! passwd $username; do
echo "Failed to set password, please try again."
done
#clean apt caches #clean apt caches
apt-get clean apt-get clean