cleanup & sync with archiso

Signed-off-by: Peter Jung <admin@ptr1337.dev>
This commit is contained in:
Peter Jung committed 2022-06-12 14:06:25 +02:00
1 parent f7ece61a0a
commit e63df359f9
7 files changed
+65 -30

No files matched your search

+12
View File
@@ -0,0 +1,12 @@
*~
archiso-*.tar.gz*
work/
out/
*.iso
*.img
*.cer
*.crt
*.key
*.pem
user-data
meta-data
+1 -1
View File
@@ -1 +1 @@
LANG=en_US.UTF-8 LANG=C.UTF-8
+3 -3
View File
@@ -4,7 +4,7 @@
# run. Advanced users may wish to specify all system modules # run. Advanced users may wish to specify all system modules
# in this array. For instance: # in this array. For instance:
# MODULES=(piix ide_disk reiserfs) # MODULES=(piix ide_disk reiserfs)
MODULES=(vmd) MODULES=()
# BINARIES # BINARIES
# This setting includes any additional binaries a given user may # 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="gzip"
#COMPRESSION="bzip2" #COMPRESSION="bzip2"
#COMPRESSION="lzma" #COMPRESSION="lzma"
#COMPRESSION="xz" COMPRESSION="xz"
#COMPRESSION="lzop" #COMPRESSION="lzop"
#COMPRESSION="lz4" #COMPRESSION="lz4"
COMPRESSION="zstd" #COMPRESSION="zstd"
# COMPRESSION_OPTIONS # COMPRESSION_OPTIONS
# Additional options for the compressor # Additional options for the compressor
@@ -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"
+46
View File
@@ -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
}
-12
View File
@@ -11,7 +11,6 @@ base
base-devel base-devel
bash-completion bash-completion
bind bind
bind-tools
boost-libs boost-libs
brltty brltty
broadcom-wl-dkms broadcom-wl-dkms
@@ -37,7 +36,6 @@ ckbcomp
clonezilla clonezilla
cloud-init cloud-init
cmake cmake
crda
cronie cronie
cryptsetup cryptsetup
darkhttpd darkhttpd
@@ -75,11 +73,6 @@ gpm
gptfdisk gptfdisk
grsync grsync
grub grub
gst-libav
gst-plugin-pipewire
gst-plugins-bad
gst-plugins-ugly
gtk-engine-murrine
gtkmm3 gtkmm3
haveged haveged
hdparm hdparm
@@ -116,7 +109,6 @@ linux-cachyos
linux-cachyos-headers linux-cachyos-headers
linux-cachyos-zfs linux-cachyos-zfs
linux-firmware linux-firmware
linux-firmware-marvell
lsb-release lsb-release
lsscsi lsscsi
lvm2 lvm2
@@ -156,8 +148,6 @@ noto-fonts
nss-mdns nss-mdns
ntfs-3g ntfs-3g
ntp ntp
nvidia-dkms
nvidia-utils
nvme-cli nvme-cli
octopi octopi
openconnect openconnect
@@ -177,7 +167,6 @@ perl
pipewire-alsa pipewire-alsa
pipewire-media-session pipewire-media-session
pipewire-pulse pipewire-pulse
plasma-browser-integration
plasma-desktop plasma-desktop
plasma-framework plasma-framework
plasma-integration plasma-integration
@@ -185,7 +174,6 @@ plasma-nm
plasma-pa plasma-pa
plasma-systemmonitor plasma-systemmonitor
plasma-thunderbolt plasma-thunderbolt
plasma-vault
plasma-workspace plasma-workspace
polkit polkit
polkit-kde-agent polkit-kde-agent
+3 -1
View File
@@ -8,7 +8,9 @@ iso_application="CachyOS Live/Rescue CD"
iso_version="$(date +%Y.%m.%d)" iso_version="$(date +%Y.%m.%d)"
install_dir="arch" install_dir="arch"
buildmodes=('iso') 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" arch="x86_64"
pacman_conf="pacman.conf" pacman_conf="pacman.conf"
airootfs_image_type="squashfs" airootfs_image_type="squashfs"