From f05518a3ca93c6d97a992aee954ae404293fd9df Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 17:47:10 +0200 Subject: [PATCH] Switch from systemd-boot to efistub --- config-root.yaml | 9 --------- efistub/arch.efi | 12 ++++++++++++ efistub/lts.efi | 12 ++++++++++++ {home/.EFISTUB => efistub}/update.sh | 2 +- home/.EFISTUB/01-arch.efi | 12 ------------ home/.EFISTUB/02-ck.efi | 12 ------------ home/.EFISTUB/03-lts.efi | 12 ------------ root/boot/loader/entries/arch-lts.conf | 5 ----- root/boot/loader/entries/kodi.conf | 5 ----- 9 files changed, 25 insertions(+), 56 deletions(-) create mode 100755 efistub/arch.efi create mode 100755 efistub/lts.efi rename {home/.EFISTUB => efistub}/update.sh (85%) delete mode 100755 home/.EFISTUB/01-arch.efi delete mode 100755 home/.EFISTUB/02-ck.efi delete mode 100755 home/.EFISTUB/03-lts.efi delete mode 100755 root/boot/loader/entries/arch-lts.conf delete mode 100755 root/boot/loader/entries/kodi.conf diff --git a/config-root.yaml b/config-root.yaml index 714389b..f2e0485 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -98,15 +98,6 @@ dotfiles: f_cpupower: src: etc/default/cpupower dst: /etc/default/cpupower - f_arch.conf: - src: boot/loader/entries/arch.conf - dst: /boot/loader/entries/arch.conf - f_arch-lts.conf: - src: boot/loader/entries/arch-lts.conf - dst: /boot/loader/entries/arch-lts.conf - f_kodi.conf: - src: boot/loader/entries/kodi.conf - dst: /boot/loader/entries/kodi.conf f_pacserve.service.conf: src: etc/pacserve/pacserve.service.conf dst: /etc/pacserve/pacserve.service.conf diff --git a/efistub/arch.efi b/efistub/arch.efi new file mode 100755 index 0000000..46c60cd --- /dev/null +++ b/efistub/arch.efi @@ -0,0 +1,12 @@ +#/bin/bash +# vim:ft=sh + +sudo efibootmgr \ + --disk /dev/sda \ + --part 1 \ + --create \ + --quiet \ + --remove-dups \ + --label "Arch Linux" \ + --loader /vmlinuz-linux \ + --unicode 'rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' diff --git a/efistub/lts.efi b/efistub/lts.efi new file mode 100755 index 0000000..9a77a19 --- /dev/null +++ b/efistub/lts.efi @@ -0,0 +1,12 @@ +#!/bin/bash +# vim:ft=sh + +sudo efibootmgr \ + --disk /dev/sda \ + --part 1 \ + --create \ + --quiet \ + --remove-dups \ + --label "Arch Linux LTS" \ + --loader /vmlinuz-linux-lts \ + --unicode 'rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo' diff --git a/home/.EFISTUB/update.sh b/efistub/update.sh similarity index 85% rename from home/.EFISTUB/update.sh rename to efistub/update.sh index 07c1dba..19a17d8 100755 --- a/home/.EFISTUB/update.sh +++ b/efistub/update.sh @@ -11,4 +11,4 @@ for bootscript in *.efi; do done # set bootorder -sudo efibootmgr --bootorder 0000,0001,0002 +sudo efibootmgr --bootorder 0000,0001 diff --git a/home/.EFISTUB/01-arch.efi b/home/.EFISTUB/01-arch.efi deleted file mode 100755 index a5f67c2..0000000 --- a/home/.EFISTUB/01-arch.efi +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# vim:ft=sh - -sudo efibootmgr \ - --disk /dev/sda \ - --part 1 \ - --create \ - --quiet \ - --remove-dups \ - --label "Arch Linux" \ - --loader /vmlinuz-linux \ - --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=3 vga=current processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux.img amdgpu.noretry=0' diff --git a/home/.EFISTUB/02-ck.efi b/home/.EFISTUB/02-ck.efi deleted file mode 100755 index b387bad..0000000 --- a/home/.EFISTUB/02-ck.efi +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# vim:ft=sh - -sudo efibootmgr \ - --disk /dev/sda \ - --part 1 \ - --create \ - --quiet \ - --remove-dups \ - --label "Arch Linux CK" \ - --loader /vmlinuz-linux-ck-zen \ - --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=3 vga=current vt.global_cursor_default=0 processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux.img amdgpu.noretry=0' diff --git a/home/.EFISTUB/03-lts.efi b/home/.EFISTUB/03-lts.efi deleted file mode 100755 index fd74e76..0000000 --- a/home/.EFISTUB/03-lts.efi +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# vim:ft=sh - -sudo efibootmgr \ - --disk /dev/sda \ - --part 1 \ - --create \ - --quiet \ - --remove-dups \ - --label "Arch Linux LTS" \ - --loader /vmlinuz-linux-lts \ - --unicode 'cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=7345408 rw quiet loglevel=3 vga=current vt.global_cursor_default=0 processor.max_cstate=5 rcu_nocbs=0-11 initrd=/amd-ucode.img initrd=/initramfs-linux.img amdgpu.noretry=0' diff --git a/root/boot/loader/entries/arch-lts.conf b/root/boot/loader/entries/arch-lts.conf deleted file mode 100755 index 1df835e..0000000 --- a/root/boot/loader/entries/arch-lts.conf +++ /dev/null @@ -1,5 +0,0 @@ -title Arch Linux LTS -initrd /amd-ucode.img -initrd /initramfs-linux-lts.img -linux /vmlinuz-linux-lts -options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait cpuidle.governor=teo diff --git a/root/boot/loader/entries/kodi.conf b/root/boot/loader/entries/kodi.conf deleted file mode 100755 index 5a86d92..0000000 --- a/root/boot/loader/entries/kodi.conf +++ /dev/null @@ -1,5 +0,0 @@ -title Kodi -initrd /amd-ucode.img -initrd /initramfs-linux.img -linux /vmlinuz-linux -options rd.luks.uuid=19fa8fab-c5fe-454a-9a17-b7185ce975ea rd.luks.name=19fa8fab-c5fe-454a-9a17-b7185ce975ea=cryptroot rd.luks.options=allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=10530935 rw quiet splash vga=current idle=nomwait video=eDP-1:d video=1920x1080@60