configure booting at the right time

2 files changed, 13 insertions, 13 deletions

diff --git a/armtixinstall b/armtixinstall
index 320be26..46d23c8 100755
--- a/armtixinstall
+++ b/armtixinstall
@@ -81,6 +81,18 @@ mount ${PART_PREFIX}1 /mnt/boot
 (cd /mnt && tar -xJf ${BOOTLOADER} && rm -f .BUILDINFO .MTREE .PKGINFO)
 (cd /mnt && tar -xJf ${FIRMWARE} && rm -f .BUILDINFO .MTREE .PKGINFO)
 
+UUID=$(blkid -s UUID -o value ${PART_PREFIX}2)
+
+cat <<EOT > /mnt/boot/config.txt
+enable_uart=1
+arm_64bit=1
+kernel=/image
+initramfs /initramfs-linux.img followkernel
+device-tree=/dtbs/broadcom/bcm2711-rpi-4-b.dtb
+EOT
+
+echo "console=ttyS1,115200 earlyprintk=serial,ttyS1,115200 kgdboc=ttyS1,115200 root=UUID=${UUID} ro rootflags=subvol=root rootwait smsc95xx.turbo_mode=N dwc_otg.lpm_enable=0" > /mnt/boot/cmdline.txt
+
 umount -R /mnt
 sync
 
diff --git a/mkarmtix b/mkarmtix
index 35a95fd..34fd2ac 100755
--- a/mkarmtix
+++ b/mkarmtix
@@ -32,19 +32,7 @@ sed -i "s/keymap=\"us\"/keymap=\"${KEYMAP}\"/" /etc/conf.d/keymaps
 
 pacman -S -needed --noconfirm btrfs-progs
 
-UUID=$(blkid -s UUID -o value ${PART_PREFIX}2)
-
-cat <<EOT > /boot/config.txt
-enable_uart=1
-arm_64bit=1
-kernel=/Image
-initramfs /initramfs-linux.img followkernel
-device-tree=/dtbs/broadcom/bcm2711-rpi-4-b.dtb
-EOT
-
-echo "console=ttyS1,115200 earlyprintk=serial,ttyS1,115200 kgdboc=ttyS1,115200 root=UUID=${UUID} ro rootflags=subvol=root rootwait smsc95xx.turbo_mode=N dwc_otg.lpm_enable=0" > /boot/cmdline.txt
-
-sed -i "s/MODULES=()/MODULES=(pcie_brcmstb)/" /etc/mkinitcpio.conf
+mkinitcpio -p linux-aarch64
 
 echo -en 'armtix\narmtix' | passwd
 userdel -r armtix