fix cdrtools and grub

This commit is contained in:
Tobias Powalowski 2023-02-09 12:39:11 +01:00
parent b433e61b71
commit 4f7a09f071
3 changed files with 5 additions and 4 deletions

View file

@ -84,7 +84,7 @@ if ! [[ -e "/.vconsole-run" ]]; then
fi
if ! [[ -e "/.clean-pacman-db" ]]; then
touch /.clean-pacman-db
_RM_PACMAN_DB="grub libxml2 icu gettext refind amd-ucode intel-ucode edk2-shell cdrtools \
_RM_PACMAN_DB="grub libxml2 icu gettext refind amd-ucode intel-ucode edk2-shell \
libisoburn libburn libisofs mkinitcpio memtest linux-api-headers jansson libwbclient \
libbsd libmd libpcap libnftnl libnfnetlink libnetfilter_conntrack libsasl libldap mtools \
libsysprof-capture libnsl libksba gdbm binutils"

View file

@ -190,12 +190,13 @@ build ()
### add secure boot MOK
add_full_dir /usr/share/archboot/keys
### remove conflicting mkinitcpio files
### remove conflicting mkinitcpio files and grub
map rm ${BUILDROOT}/usr/lib/systemd/system/mkinitcpio-generate-shutdown-ramfs.service \
${BUILDROOT}/usr/lib/systemd/system/shutdown.target.wants/mkinitcpio-generate-shutdown-ramfs.service \
${BUILDROOT}/usr/lib/tmpfiles.d/mkinitcpio.conf \
${BUILDROOT}/usr/share/bash-completion/completions/lsinitcpio \
${BUILDROOT}/usr/share/bash-completion/completions/mkinitcpio
${BUILDROOT}/usr/share/bash-completion/completions/mkinitcpio \
${BUILDROOT}/usr/share/bash-completion/completions/grub
### fix licenses
map add_file /usr/share/licenses/shadow/COPYING /usr/share/licenses/iana-etc/LICENSE \

View file

@ -22,7 +22,7 @@ udevadm info --cleanup-db
echo "Step 2/3: Initializing /dev/zram0..."
modprobe zram
echo "zstd" >/sys/block/zram0/comp_algorithm
echo "3500M" > /sys/block/zram0/disksize
echo "4G" > /sys/block/zram0/disksize
mkfs.btrfs /dev/zram0 &>/dev/null
mount /dev/zram0 /new_root &>/dev/null
mount UUID=1234-ABCD /mnt