From 94ec142fcf6a7b76d595fe452a1d2c5a2b9268b4 Mon Sep 17 00:00:00 2001 From: Vladislav Nepogodin Date: Thu, 14 Oct 2021 01:41:02 +0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20use=20`linux-cachyos-bmq`=20inst?= =?UTF-8?q?ead=20of=20`linux`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entries/01-archiso-x86_64-linux.conf | 4 +- .../entries/02-archiso-x86_64-linux-nv.conf | 4 +- archiso/packages.x86_64 | 42 ++++++------------- archiso/syslinux/archiso_pxe-linux.cfg | 12 +++--- archiso/syslinux/archiso_sys-linux.cfg | 8 ++-- 5 files changed, 27 insertions(+), 43 deletions(-) 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 4f18fb9..9902314 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-bmq 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-bmq.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G i915.modeset=1 radeon.modeset=1 nvidia.blacklist=yes modprobe.blacklist=nvidia nouveau.modeset=1 nouveau 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 597618f..b481fd0 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-bmq 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-bmq.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G nvidia nouveau.modeset=0 nouveau.blacklist=yes modprobe.blacklist=nouveau i915.modeset=1 radeon.modeset=1 diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64 index 4fba95b..4c5e2e7 100644 --- a/archiso/packages.x86_64 +++ b/archiso/packages.x86_64 @@ -6,7 +6,7 @@ b43-fwcutter base bind-tools brltty -broadcom-wl +broadcom-wl-dkms btrfs-progs clonezilla cloud-init @@ -47,10 +47,9 @@ less lftp libfido2 libusb-compat -linux +linux-cachyos-bmq linux-atm linux-firmware -livecd-sounds lsscsi lvm2 lynx @@ -119,27 +118,9 @@ zsh # everything above comes from archiso releng folder -####################################################### -### ALCI ### -####################################################### -####################################################### -### PACKAGES THAT ARE REMOVED AFTER INSTALLATION ### -### VIA CALAMARES CONFIG ### -####################################################### - -#alci-dwm -#alci-dwm-nemesis -#alci-calamares cachyos-calamares -#alci-calamares-dev -#alci-calamares-config cachyos-calamares-config -#alci-calamares-config-btrfs -#alci-calamares-config-dev -#alci-calamares-config-lts -#alci-calamares-config-pure -#alci-calamares-config-zen ####################################################### ### PACKAGES THAT STAY AFTER INSTALLATION ### @@ -251,7 +232,7 @@ base-devel ##### want to have linux-headers -linux-headers +linux-cachyos-bmq-headers @@ -292,10 +273,14 @@ alsa-utils alsa-plugins alsa-firmware sof-firmware -pulseaudio-alsa -pulseaudio-bluetooth -pulseaudio-equalizer -pulseaudio-jack +pipewire +pipewire-alsa +pipewire-jack +pipewire-media-session +pipewire-pulse +pipewire-support +pipewire-zeroconf +profile-sync-daemon pavucontrol ffmpegthumbnailer gst-libav @@ -340,6 +325,5 @@ xf86-video-vmware ##### want to add/use your local repo packages ##### create your packages and put them in the local repo -timeshift -#grub-btrfs -#timeshift-autosnap +veracrypt +firejail diff --git a/archiso/syslinux/archiso_pxe-linux.cfg b/archiso/syslinux/archiso_pxe-linux.cfg index 66bbd0d..1e4205f 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-bmq +INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-bmq.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-bmq +INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-bmq.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-bmq +INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-bmq.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..02257d6 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-bmq +INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-bmq.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-bmq +INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-bmq.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G nouveau.modeset=0 modprobe.blacklist=nouveau nvidia i915.modeset=1 radeon.modeset=1