diff options
author | David P <megver83@parabola.nu> | 2022-07-15 17:58:45 -0400 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2022-07-15 17:58:45 -0400 |
commit | c3b9a1da1467f3a6154edca7c4985da265e0e24d (patch) | |
tree | 6c8d126b91dbe8e2e5bc8405e185db2f61bdf6fc | |
parent | acd732e1d19fc681f7971c170dd9ecf3335a9f19 (diff) |
sync with archiso b7373f5
archiso:
b7373f5 (HEAD -> master, tag: v65, origin/master, origin/HEAD) Add changelog for 65
8654064 configs/*/grub/grub.cfg: enable serial input and output
Signed-off-by: David P <megver83@parabola.nu>
-rw-r--r-- | CHANGELOG.rst | 12 | ||||
-rw-r--r-- | configs/baseline/grub/grub.cfg | 13 | ||||
-rw-r--r-- | configs/releng/grub/grub.cfg | 14 |
3 files changed, 34 insertions, 5 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2759e3d..901d175 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -8,6 +8,18 @@ Changelog Added ----- +Changed +------- + +Removed +------- + +[65] - 2022-06-30 +================= + +Added +----- + - Configure the locale for the baseline profile to ``C.UTF-8`` so that a UTF-8 locale is used. - Add ``uefi-x64.grub.esp`` and ``uefi-x64.grub.eltorito`` boot mode to support x86_64 UEFI boot on x86_64 machines. - Use ``mkfs.erofs``'s ``ztailpacking`` option in the baseline profile to reduce the image size. diff --git a/configs/baseline/grub/grub.cfg b/configs/baseline/grub/grub.cfg index 6b7db5c..65e1c6d 100644 --- a/configs/baseline/grub/grub.cfg +++ b/configs/baseline/grub/grub.cfg @@ -1,12 +1,12 @@ +# Load partition table and file system modules insmod part_gpt insmod part_msdos insmod fat insmod iso9660 +# Use graphics-mode output insmod all_video - insmod font - if loadfont "${prefix}/fonts/unicode.pf2" ; then insmod gfxterm set gfxmode="auto" @@ -14,10 +14,19 @@ if loadfont "${prefix}/fonts/unicode.pf2" ; then terminal_output gfxterm fi +# Enable serial console +if serial --unit=0 --speed=115200; then + terminal_input --append serial + terminal_output --append serial +fi + +# Set default menu entry default=parabola timeout=15 timeout_style=menu +# Menu entries + 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% diff --git a/configs/releng/grub/grub.cfg b/configs/releng/grub/grub.cfg index d3ed9d2..e5ef077 100644 --- a/configs/releng/grub/grub.cfg +++ b/configs/releng/grub/grub.cfg @@ -1,12 +1,12 @@ +# Load partition table and file system modules insmod part_gpt insmod part_msdos insmod fat insmod iso9660 +# Use graphics-mode output insmod all_video - insmod font - if loadfont "${prefix}/fonts/unicode.pf2" ; then insmod gfxterm set gfxmode="auto" @@ -14,14 +14,22 @@ if loadfont "${prefix}/fonts/unicode.pf2" ; then terminal_output gfxterm fi +# Enable serial console +if serial --unit=0 --speed=115200; then + terminal_input --append serial + terminal_output --append serial +fi + +# Set default menu entry default=parabola timeout=15 timeout_style=menu # GRUB init tune for accessibility -# play 600 988 1 1319 4 +# Menu entries + menuentry "Parabola GNU/Linux-libre install medium (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% |