From 80969170913c1c8948b4bc46fe645ab273eb9492 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Fri, 20 May 2022 18:02:22 +0200 Subject: [PATCH] revert uefi-fixes Signed-off-by: Peter Jung --- .../airootfs/etc/mkinitcpio.d/linux.preset | 4 ++-- .../entries/01-archiso-x86_64-linux.conf | 4 ++-- .../entries/02-archiso-x86_64-linux-nv.conf | 4 ++-- archiso/packages.x86_64 | 19 +++++++++++-------- archiso/syslinux/archiso_pxe-linux.cfg | 12 ++++++------ archiso/syslinux/archiso_sys-linux.cfg | 8 ++++---- 6 files changed, 27 insertions(+), 24 deletions(-) diff --git a/archiso/airootfs/etc/mkinitcpio.d/linux.preset b/archiso/airootfs/etc/mkinitcpio.d/linux.preset index 9f67184..ed167b1 100644 --- a/archiso/airootfs/etc/mkinitcpio.d/linux.preset +++ b/archiso/airootfs/etc/mkinitcpio.d/linux.preset @@ -2,7 +2,7 @@ PRESETS=('archiso') -ALL_kver='/boot/vmlinuz-linux' +ALL_kver='/boot/vmlinuz-linux-cachyos' ALL_config='/etc/mkinitcpio.conf' -archiso_image="/boot/initramfs-linux.img" +archiso_image="/boot/initramfs-linux-cachyos.img" diff --git a/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf index 8b88652..eba695c 100644 --- a/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,6 +1,6 @@ title CachyOS x86_64 UEFI Default -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes diff --git a/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf b/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf index 1b3925a..eeb2dce 100644 --- a/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf +++ b/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf @@ -1,6 +1,6 @@ title CachyOS x86_64 UEFI NVIDIA (latest cards only) -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G nvidia nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64 index 6158491..3f4b1dc 100644 --- a/archiso/packages.x86_64 +++ b/archiso/packages.x86_64 @@ -9,6 +9,7 @@ alsa-utils amd-ucode archlinux-keyring arch-install-scripts +## Archive b43-fwcutter base base-devel @@ -19,6 +20,7 @@ brltty bluez bluez-utils boost-libs +## Boot broadcom-wl-dkms btrfs-progs cachy-browser @@ -91,7 +93,7 @@ gst-plugins-ugly gtk-engine-murrine gtkmm3 hdparm -# hyperv not needed +hyperv hwdetect hwinfo ## Image viewer @@ -118,8 +120,9 @@ libwnck3 libxinerama lightly-git linux-atm -linux -linux-headers +linux-cachyos +linux-cachyos-headers +linux-cachyos-zfs linux-firmware linux-firmware-marvell livecd-sounds @@ -152,6 +155,7 @@ ndisc6 neofetch netctl net-tools +#network networkmanager network-manager-applet networkmanager-openvpn @@ -171,9 +175,9 @@ nvme-cli octopi openconnect opendesktop-fonts -# open-iscsi not needed +open-iscsi openssh -# open-vm-tools ## uefi fais +open-vm-tools openvpn os-prober packagekit-qt5 @@ -213,7 +217,7 @@ pv python python-defusedxml pcsclite -# qemu-guest-agent break uefi boot +qemu-guest-agent qt5ct qt5-tools qt5-xmlpatterns @@ -256,7 +260,7 @@ usb_modeswitch usbmuxd usbutils vim -# virtualbox-guest-utils-nox breaks uefi boot +virtualbox-guest-utils-nox vpnc wayland wayland-protocols @@ -287,6 +291,5 @@ xorg-xinput xorg-xkill xorg-xrandr xorg-xrdb -zfs-dkms zfs-utils zsh diff --git a/archiso/syslinux/archiso_pxe-linux.cfg b/archiso/syslinux/archiso_pxe-linux.cfg index ca5e9cf..d2485a1 100644 --- a/archiso/syslinux/archiso_pxe-linux.cfg +++ b/archiso/syslinux/archiso_pxe-linux.cfg @@ -4,8 +4,8 @@ Boot the CachyOS install medium using NBD. It allows you to install CachyOS or perform system maintenance. ENDTEXT MENU LABEL CachyOS install medium (x86_64, NBD) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos +INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 @@ -15,8 +15,8 @@ Boot the CachyOS live medium using NFS. It allows you to install CachyOS or perform system maintenance. ENDTEXT MENU LABEL CachyOS install medium (x86_64, NFS) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos +INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt checksum verify SYSAPPEND 3 @@ -26,7 +26,7 @@ Boot the CachyOS live medium using HTTP. It allows you to install CachyOS or perform system maintenance. ENDTEXT MENU LABEL CachyOS install medium (x86_64, HTTP) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos +INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ checksum verify SYSAPPEND 3 diff --git a/archiso/syslinux/archiso_sys-linux.cfg b/archiso/syslinux/archiso_sys-linux.cfg index 5fbc13d..e124431 100644 --- a/archiso/syslinux/archiso_sys-linux.cfg +++ b/archiso/syslinux/archiso_sys-linux.cfg @@ -4,8 +4,8 @@ Boot the CachyOS install medium on BIOS. It allows you to install CachyOS or perform system maintenance. ENDTEXT MENU LABEL CachyOS default (x86_64, BIOS) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos +INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G nouveau.modeset=1 nouveau i915.modeset=1 radeon.modeset=1 modprobe.blacklist=nvidia # Nvidia propritary (Non-Free) @@ -15,6 +15,6 @@ Boot the CachyOS install medium on Bios NVIDIA-NONFREE driver LATEST-CARDS NO-LE It allows you to install CachyOS or perform system maintenance. ENDTEXT MENU LABEL CachyOS NVIDIA (latest cards, x86_64, BIOS) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos +INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G nouveau.modeset=0 modprobe.blacklist=nouveau nvidia i915.modeset=1 radeon.modeset=1