From e63df359f9a84d2c105062b7a57c0401fa373e26 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Sun, 12 Jun 2022 14:06:20 +0200 Subject: [PATCH] cleanup & sync with archiso Signed-off-by: Peter Jung --- .gitignore | 12 +++++ archiso/airootfs/etc/locale.conf | 2 +- archiso/airootfs/etc/mkinitcpio.conf | 6 +-- .../etc/pacman.d/hooks/40-locale-gen.hook | 13 ------ archiso/grub/grub.cfg | 46 +++++++++++++++++++ archiso/packages.x86_64 | 12 ----- archiso/profiledef.sh | 4 +- 7 files changed, 65 insertions(+), 30 deletions(-) create mode 100644 .gitignore delete mode 100644 archiso/airootfs/etc/pacman.d/hooks/40-locale-gen.hook create mode 100644 archiso/grub/grub.cfg diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..74a0a52 --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +*~ +archiso-*.tar.gz* +work/ +out/ +*.iso +*.img +*.cer +*.crt +*.key +*.pem +user-data +meta-data diff --git a/archiso/airootfs/etc/locale.conf b/archiso/airootfs/etc/locale.conf index 01ec548..f9c983c 100644 --- a/archiso/airootfs/etc/locale.conf +++ b/archiso/airootfs/etc/locale.conf @@ -1 +1 @@ -LANG=en_US.UTF-8 +LANG=C.UTF-8 diff --git a/archiso/airootfs/etc/mkinitcpio.conf b/archiso/airootfs/etc/mkinitcpio.conf index 3c13b0a..3968c4c 100644 --- a/archiso/airootfs/etc/mkinitcpio.conf +++ b/archiso/airootfs/etc/mkinitcpio.conf @@ -4,7 +4,7 @@ # run. Advanced users may wish to specify all system modules # in this array. For instance: # MODULES=(piix ide_disk reiserfs) -MODULES=(vmd) +MODULES=() # BINARIES # This setting includes any additional binaries a given user may @@ -57,10 +57,10 @@ HOOKS=(base udev modconf memdisk archiso archiso_loop_mnt archiso_pxe_common arc #COMPRESSION="gzip" #COMPRESSION="bzip2" #COMPRESSION="lzma" -#COMPRESSION="xz" +COMPRESSION="xz" #COMPRESSION="lzop" #COMPRESSION="lz4" -COMPRESSION="zstd" +#COMPRESSION="zstd" # COMPRESSION_OPTIONS # Additional options for the compressor diff --git a/archiso/airootfs/etc/pacman.d/hooks/40-locale-gen.hook b/archiso/airootfs/etc/pacman.d/hooks/40-locale-gen.hook deleted file mode 100644 index 82dd199..0000000 --- a/archiso/airootfs/etc/pacman.d/hooks/40-locale-gen.hook +++ /dev/null @@ -1,13 +0,0 @@ -# remove from airootfs! -[Trigger] -Operation = Install -Type = Package -Target = glibc - -[Action] -Description = Uncommenting en_US.UTF-8 locale and running locale-gen... -When = PostTransaction -Depends = glibc -Depends = sed -Depends = sh -Exec = /bin/sh -c "sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen && locale-gen" diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg new file mode 100644 index 0000000..732969e --- /dev/null +++ b/archiso/grub/grub.cfg @@ -0,0 +1,46 @@ +insmod part_gpt +insmod part_msdos +insmod fat +insmod iso9660 + +insmod all_video + +insmod font + +if loadfont "${prefix}/fonts/unicode.pf2" ; then + insmod gfxterm + set gfxmode="auto" + terminal_input console + terminal_output gfxterm +fi + +# GRUB init tune for accessibility +# +# Morse translation table: +# "." is "500 1 300 1" +# "-" is "600 3 300 1" +# " " is "100 2" +# "/" is "100 5" +# +# Message: "s for blind" +play 500 500 1 300 1 500 1 300 1 500 1 300 1 100 5 500 1 300 1 500 1 300 1 100 2 500 1 300 1 500 1 300 1 600 3 300 1 500 1 300 1 100 5 600 3 300 1 500 1 300 1 500 1 300 1 500 1 300 1 100 2 500 1 300 1 600 3 300 1 500 1 300 1 500 1 300 1 100 2 500 1 300 1 500 1 300 1 100 2 500 1 300 1 500 1 300 1 100 2 600 3 300 1 500 1 300 1 100 2 600 3 300 1 500 1 300 1 500 1 300 1 + +menuentry "CachyOS install medium (x86_64, UEFI)" { + set gfxpayload=keep + search --no-floppy --set=root --label %ARCHISO_LABEL% + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% + initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +} + +menuentry "Arch Linux install medium with speakup screen reader (x86_64, UEFI)" --hotkey=s { + set gfxpayload=keep + search --no-floppy --set=root --label %ARCHISO_LABEL% + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on + initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +} + +menuentry "UEFI Shell" { + insmod chain + search --no-floppy --set=root --label %ARCHISO_LABEL% + chainloader /shellia32.efi +} diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64 index 82712c9..33abe40 100644 --- a/archiso/packages.x86_64 +++ b/archiso/packages.x86_64 @@ -11,7 +11,6 @@ base base-devel bash-completion bind -bind-tools boost-libs brltty broadcom-wl-dkms @@ -37,7 +36,6 @@ ckbcomp clonezilla cloud-init cmake -crda cronie cryptsetup darkhttpd @@ -75,11 +73,6 @@ gpm gptfdisk grsync grub -gst-libav -gst-plugin-pipewire -gst-plugins-bad -gst-plugins-ugly -gtk-engine-murrine gtkmm3 haveged hdparm @@ -116,7 +109,6 @@ linux-cachyos linux-cachyos-headers linux-cachyos-zfs linux-firmware -linux-firmware-marvell lsb-release lsscsi lvm2 @@ -156,8 +148,6 @@ noto-fonts nss-mdns ntfs-3g ntp -nvidia-dkms -nvidia-utils nvme-cli octopi openconnect @@ -177,7 +167,6 @@ perl pipewire-alsa pipewire-media-session pipewire-pulse -plasma-browser-integration plasma-desktop plasma-framework plasma-integration @@ -185,7 +174,6 @@ plasma-nm plasma-pa plasma-systemmonitor plasma-thunderbolt -plasma-vault plasma-workspace polkit polkit-kde-agent diff --git a/archiso/profiledef.sh b/archiso/profiledef.sh index a99dd3f..e1402b4 100644 --- a/archiso/profiledef.sh +++ b/archiso/profiledef.sh @@ -8,7 +8,9 @@ iso_application="CachyOS Live/Rescue CD" iso_version="$(date +%Y.%m.%d)" install_dir="arch" buildmodes=('iso') -bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito') +bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' + 'uefi-ia32.grub.esp' 'uefi-x64.systemd-boot.esp' + 'uefi-ia32.grub.eltorito' 'uefi-x64.systemd-boot.eltorito') arch="x86_64" pacman_conf="pacman.conf" airootfs_image_type="squashfs"