summaryrefslogtreecommitdiff
path: root/configs/baseline
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2022-06-26 21:19:24 -0400
committerDavid P <megver83@parabola.nu>2022-06-26 21:27:02 -0400
commitacd732e1d19fc681f7971c170dd9ecf3335a9f19 (patch)
treea197595dbf6b8582222204c36e8055ed809b767b /configs/baseline
parent35b683466b00a1c4689c73b60558cdbce3edcace (diff)
snyc with archiso fda1907
archiso: fda1907 (HEAD -> master, origin/master, origin/HEAD) mkarchiso: work arround GRUB's cmdpath having incorect case on some firmware e654106 configs/*/grub/grub.cfg: auto-boot after 15 seconds 9a98ae6 Merge remote-tracking branch 'origin/merge-requests/266' eaa2f8a change grub init tune 53a3ad2 mkarchiso: add SBAT metadata to grub-mkstandalone created EFI binaries 91b48f8 mkarchiso: improve comments b72523e configs/baseline/profiledef.sh: add `-E ztailpacking` to airootfs_image_tool_options for mkfs.erofs 052987b Merge remote-tracking branch 'origin/merge-requests/261' 2a8fc3b Merge remote-tracking branch 'origin/merge-requests/256' b8957f0 Add implicit package dependencies to PACKAGE_LIST in .gitlab-ci.yml 39fddfa Update documentation for uefi x64 grub boot modes e51b6f6 Use grub for uefi x64 boot modes in profiledef.sh 550b5be Add *_uefi-x64.grub.* functions to mkarchiso 98de411 Add useful grub menu entries to grub.cfg de15108 mkarchiso: use C.UTF-8 ba11c40 configs/: use the C.UTF-8 locale 89292ce .gitignore: ignore *.cer, *.crt, *.key, *.pem and *.img parabolaiso: * TODO: Since now GRUB for EFI is upstream, I want to make some testing for the OpenRC profiles and deprecate our downstream refind implementation Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'configs/baseline')
-rw-r--r--configs/baseline/airootfs/etc/locale.conf1
-rw-r--r--configs/baseline/grub/grub.cfg10
-rw-r--r--configs/baseline/profiledef.sh2
3 files changed, 9 insertions, 4 deletions
diff --git a/configs/baseline/airootfs/etc/locale.conf b/configs/baseline/airootfs/etc/locale.conf
new file mode 100644
index 0000000..f9c983c
--- /dev/null
+++ b/configs/baseline/airootfs/etc/locale.conf
@@ -0,0 +1 @@
+LANG=C.UTF-8
diff --git a/configs/baseline/grub/grub.cfg b/configs/baseline/grub/grub.cfg
index 3d0234a..6b7db5c 100644
--- a/configs/baseline/grub/grub.cfg
+++ b/configs/baseline/grub/grub.cfg
@@ -14,14 +14,18 @@ if loadfont "${prefix}/fonts/unicode.pf2" ; then
terminal_output gfxterm
fi
-menuentry "Parabola GNU/Linux-libre (x86_64, UEFI)" {
+default=parabola
+timeout=15
+timeout_style=menu
+
+menuentry "Parabola GNU/Linux-libre (x86_64, UEFI)" --class arch --class gnu-linux --class gnu --class os --id 'parabola' {
set gfxpayload=keep
search --no-floppy --set=root --label %PARABOLAISO_LABEL%
- linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%
+ linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
}
-menuentry "Parabola GNU/Linux-libre (x86_64, UEFI) Copy to RAM" {
++menuentry "Parabola GNU/Linux-libre (x86_64, UEFI) Copy to RAM" --class arch --class gnu-linux --class gnu --class os --id 'parabola-copy-to-ram' {
set gfxpayload=keep
search --no-floppy --set=root --label %PARABOLAISO_LABEL%
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram
diff --git a/configs/baseline/profiledef.sh b/configs/baseline/profiledef.sh
index 95c1364..7e714ef 100644
--- a/configs/baseline/profiledef.sh
+++ b/configs/baseline/profiledef.sh
@@ -14,7 +14,7 @@ bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito'
arch="x86_64"
pacman_conf="pacman.conf"
airootfs_image_type="erofs"
-airootfs_image_tool_options=('-zlz4hc,12')
+airootfs_image_tool_options=('-zlz4hc,12' -E ztailpacking)
file_permissions=(
["/etc/shadow"]="0:0:400"
)