From d547f80cd266729136f87672d2d44c99e477e860 Mon Sep 17 00:00:00 2001 From: Valeria Fadeeva Date: Sat, 6 Jan 2024 21:28:10 +0500 Subject: [PATCH] Update --- .../airootfs/etc/dracut.conf.d/defaults.conf | 2 +- Melawy-Linux-Full/airootfs/etc/environment | 2 +- Melawy-Linux-Full/airootfs/etc/motd | 12 ++--- .../airootfs/etc/pacman.d/mirrorlist | 36 +++++++------- .../airootfs/root/.automated_script.sh | 13 ++--- .../entries/01-archiso-x86_64-linux.conf | 4 +- .../entries/02-archiso-x86_64-linux-nv.conf | 4 +- .../loader/entries/03-archiso-x86_64-efi.conf | 4 +- .../entries/04-archiso-x86_64-efi-nv.conf | 4 +- .../05-archiso-x86_64-linux-nomodeset.conf | 7 +++ Melawy-Linux-Full/grub/grub.cfg | 25 ++++++---- Melawy-Linux-Full/grub/loopback.cfg | 22 ++++++--- .../airootfs/etc/dracut.conf.d/defaults.conf | 2 +- .../airootfs/etc/environment | 2 +- Melawy-Linux-NetInstall/airootfs/etc/motd | 12 ++--- .../airootfs/etc/pacman.d/mirrorlist | 34 ++++++------- .../airootfs/root/.automated_script.sh | 13 ++--- .../entries/01-archiso-x86_64-linux.conf | 4 +- .../entries/02-archiso-x86_64-linux-nv.conf | 4 +- .../loader/entries/03-archiso-x86_64-efi.conf | 4 +- .../entries/04-archiso-x86_64-efi-nv.conf | 4 +- .../05-archiso-x86_64-linux-nomodeset.conf | 7 +++ Melawy-Linux-NetInstall/grub/grub.cfg | 25 ++++++---- Melawy-Linux-NetInstall/grub/loopback.cfg | 22 ++++++--- Melawy-Linux-Tiny/00_mkdirs.sh | 9 ---- Melawy-Linux-Tiny/00_reset_light.sh | 15 ------ Melawy-Linux-Tiny/00_reset_with_packages.sh | 21 -------- Melawy-Linux-Tiny/01_rank_mirrorlist.sh | 15 ------ Melawy-Linux-Tiny/02_prepare.sh | 49 ------------------- Melawy-Linux-Tiny/03_chown.sh | 11 ----- Melawy-Linux-Tiny/04_make.sh | 44 ----------------- Melawy-Linux-Tiny/05_sign.sh | 43 ---------------- Melawy-Linux-Tiny/06_chown.sh | 9 ---- .../airootfs/etc/dracut.conf.d/defaults.conf | 2 +- Melawy-Linux-Tiny/airootfs/etc/environment | 2 +- Melawy-Linux-Tiny/airootfs/etc/motd | 12 ++--- .../airootfs/etc/pacman.d/mirrorlist | 36 +++++++------- .../airootfs/root/.automated_script.sh | 13 ++--- .../entries/01-archiso-x86_64-linux.conf | 4 +- .../entries/02-archiso-x86_64-linux-nv.conf | 4 +- .../loader/entries/03-archiso-x86_64-efi.conf | 4 +- .../entries/04-archiso-x86_64-efi-nv.conf | 4 +- .../05-archiso-x86_64-linux-nomodeset.conf | 7 +++ Melawy-Linux-Tiny/grub/grub.cfg | 25 ++++++---- Melawy-Linux-Tiny/grub/loopback.cfg | 22 ++++++--- clear.sh | 0 make.sh | 0 47 files changed, 230 insertions(+), 389 deletions(-) create mode 100644 Melawy-Linux-Full/efiboot/loader/entries/05-archiso-x86_64-linux-nomodeset.conf create mode 100644 Melawy-Linux-NetInstall/efiboot/loader/entries/05-archiso-x86_64-linux-nomodeset.conf delete mode 100755 Melawy-Linux-Tiny/00_mkdirs.sh delete mode 100755 Melawy-Linux-Tiny/00_reset_light.sh delete mode 100755 Melawy-Linux-Tiny/00_reset_with_packages.sh delete mode 100755 Melawy-Linux-Tiny/01_rank_mirrorlist.sh delete mode 100755 Melawy-Linux-Tiny/02_prepare.sh delete mode 100755 Melawy-Linux-Tiny/03_chown.sh delete mode 100755 Melawy-Linux-Tiny/04_make.sh delete mode 100755 Melawy-Linux-Tiny/05_sign.sh delete mode 100755 Melawy-Linux-Tiny/06_chown.sh create mode 100644 Melawy-Linux-Tiny/efiboot/loader/entries/05-archiso-x86_64-linux-nomodeset.conf mode change 100644 => 100755 clear.sh mode change 100644 => 100755 make.sh diff --git a/Melawy-Linux-Full/airootfs/etc/dracut.conf.d/defaults.conf b/Melawy-Linux-Full/airootfs/etc/dracut.conf.d/defaults.conf index ad58786..e549489 100644 --- a/Melawy-Linux-Full/airootfs/etc/dracut.conf.d/defaults.conf +++ b/Melawy-Linux-Full/airootfs/etc/dracut.conf.d/defaults.conf @@ -1,3 +1,3 @@ omit_dracutmodules+=" network cifs nfs brltty " -compress="zstd" +compress="xz" hostonly="no" diff --git a/Melawy-Linux-Full/airootfs/etc/environment b/Melawy-Linux-Full/airootfs/etc/environment index ff3721a..664ebce 100644 --- a/Melawy-Linux-Full/airootfs/etc/environment +++ b/Melawy-Linux-Full/airootfs/etc/environment @@ -13,5 +13,5 @@ #SDL_VIDEODRIVER="wayland,x11" GTK_USE_PORTAL=1 BROWSER=firefox -EDITOR=nano +EDITOR=mcedit ZPOOL_VDEV_NAME_PATH=1 diff --git a/Melawy-Linux-Full/airootfs/etc/motd b/Melawy-Linux-Full/airootfs/etc/motd index 16dedd7..e10b69f 100755 --- a/Melawy-Linux-Full/airootfs/etc/motd +++ b/Melawy-Linux-Full/airootfs/etc/motd @@ -2,7 +2,7 @@ This ISO is based on Arch-ISO modified hugely to provide Installation Environmen https://melawy.ru Melawy Linux-archiso Sources: -https://github.com/Melawy +https://gitlab.com/melawy Arch-ISO Source: https://gitlab.archlinux.org/archlinux/archiso @@ -12,12 +12,12 @@ https://github.com/calamares/calamares Live environment will start now and let you install Melawy Linux to disk, or tryout KDE-Desktop from Live-Session. -Bugs can be reported here: -https://github.com/Melawy +Getting help: +https://melawy.ru +https://sourceforge.net/projects/melawy-linux/support -Getting help: https://Melawy.ru -Chat on telegram: https://t.me/Melawy_chat -News on telegram: https://t.me/Melawy_news +Bugs can be reported here: +https://sourceforge.net/projects/melawy-linux/support Our journey wouldn't be made possible without the donates: https://melawy.ru/donate diff --git a/Melawy-Linux-Full/airootfs/etc/pacman.d/mirrorlist b/Melawy-Linux-Full/airootfs/etc/pacman.d/mirrorlist index bf4b8a5..2e302c9 100644 --- a/Melawy-Linux-Full/airootfs/etc/pacman.d/mirrorlist +++ b/Melawy-Linux-Full/airootfs/etc/pacman.d/mirrorlist @@ -3,28 +3,28 @@ ################################################################################ # With: reflector @/etc/xdg/reflector/reflector.conf -# When: 2023-12-23 11:39:24 UTC +# When: 2024-01-06 08:42:28 UTC # From: https://archlinux.org/mirrors/status/json/ -# Retrieved: 2023-12-23 11:38:53 UTC -# Last Check: 2023-12-23 11:12:26 UTC +# Retrieved: 2024-01-06 08:41:50 UTC +# Last Check: 2024-01-06 08:16:26 UTC -Server = https://pkg.adfinis.com/archlinux/$repo/os/$arch -Server = http://mirror.f4st.host/archlinux/$repo/os/$arch -Server = https://mirror.sunred.org/archlinux/$repo/os/$arch +Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch Server = http://mirror.sunred.org/archlinux/$repo/os/$arch -Server = https://archlinux.mailtunnel.eu/$repo/os/$arch -Server = http://pkg.adfinis.com/archlinux/$repo/os/$arch -Server = https://archlinux.thaller.ws/$repo/os/$arch -Server = http://mirror.ubrco.de/archlinux/$repo/os/$arch -Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch -Server = http://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch -Server = http://archlinux.thaller.ws/$repo/os/$arch -Server = https://mirror.moson.org/arch/$repo/os/$arch -Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch Server = https://mirror.f4st.host/archlinux/$repo/os/$arch -Server = rsync://sync.mirror.sunred.org/archlinux/$repo/os/$arch +Server = http://mirror.f4st.host/archlinux/$repo/os/$arch +Server = https://archlinux.thaller.ws/$repo/os/$arch +Server = http://mirror.cyberbits.eu/archlinux/$repo/os/$arch +Server = https://mirror.sunred.org/archlinux/$repo/os/$arch +Server = https://archlinux.mailtunnel.eu/$repo/os/$arch +Server = https://mirror.cyberbits.eu/archlinux/$repo/os/$arch +Server = http://mirror.moson.org/arch/$repo/os/$arch +Server = https://mirror.moson.org/arch/$repo/os/$arch +Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch +Server = http://archlinux.thaller.ws/$repo/os/$arch Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch -Server = rsync://pkg.adfinis.com/archlinux/$repo/os/$arch -Server = rsync://mirror.ubrco.de/archlinux/$repo/os/$arch Server = rsync://archlinux.mailtunnel.eu/archlinux/$repo/os/$arch +Server = rsync://sync.mirror.sunred.org/archlinux/$repo/os/$arch +Server = rsync://mirror.moson.org/arch/$repo/os/$arch +Server = http://arch.mirror.far.fi/$repo/os/$arch +Server = rsync://arch.mirror.far.fi/archlinux/$repo/os/$arch Server = rsync://mirror.f4st.host/archlinux/$repo/os/$arch diff --git a/Melawy-Linux-Full/airootfs/root/.automated_script.sh b/Melawy-Linux-Full/airootfs/root/.automated_script.sh index f257537..2f966d0 100755 --- a/Melawy-Linux-Full/airootfs/root/.automated_script.sh +++ b/Melawy-Linux-Full/airootfs/root/.automated_script.sh @@ -1,21 +1,22 @@ #!/usr/bin/env bash -script_cmdline () -{ +script_cmdline() { local param for param in $(< /proc/cmdline); do case "${param}" in - script=*) echo "${param#*=}" ; return 0 ;; + script=*) + echo "${param#*=}" + return 0 + ;; esac done } -automated_script () -{ +automated_script() { local script rt script="$(script_cmdline)" if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then - if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then + if [[ "${script}" =~ ^((http|https|ftp|tftp)://) ]]; then # there's no synchronization for network availability before executing this script printf '%s: waiting for network-online.target\n' "$0" until systemctl --quiet is-active network-online.target; do diff --git a/Melawy-Linux-Full/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/Melawy-Linux-Full/efiboot/loader/entries/01-archiso-x86_64-linux.conf index 34e732b..7b22819 100644 --- a/Melawy-Linux-Full/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/Melawy-Linux-Full/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,5 +1,5 @@ -title Melawy Linux install medium x86_64 UEFI Default -sort-key 01 +title Melawy Linux install medium x86_64 UEFI with (Open-Source Drivers) +sort-key 01 linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img diff --git a/Melawy-Linux-Full/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf b/Melawy-Linux-Full/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf index b12aa2c..c792346 100644 --- a/Melawy-Linux-Full/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf +++ b/Melawy-Linux-Full/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf @@ -1,5 +1,5 @@ -title Melawy Linux install medium x86_64 UEFI NVIDIA (latest cards only) -sort-key 02 +title Melawy Linux install medium x86_64 UEFI with (Nvidia Drivers. Start from video card Nvidia GTX 900+) +sort-key 02 linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img diff --git a/Melawy-Linux-Full/efiboot/loader/entries/03-archiso-x86_64-efi.conf b/Melawy-Linux-Full/efiboot/loader/entries/03-archiso-x86_64-efi.conf index 95ec9c0..baa3177 100644 --- a/Melawy-Linux-Full/efiboot/loader/entries/03-archiso-x86_64-efi.conf +++ b/Melawy-Linux-Full/efiboot/loader/entries/03-archiso-x86_64-efi.conf @@ -1,4 +1,4 @@ -title Melawy Linux install medium x86_64 UEFI EFI Default -sort-key 03 +title Melawy Linux install medium x86_64 UEFI EFI with (Open-Source Drivers) +sort-key 03 efi /%INSTALL_DIR%/boot/x86_64/linux-cachyos.efi options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Full/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf b/Melawy-Linux-Full/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf index 36c955d..d55c1fb 100644 --- a/Melawy-Linux-Full/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf +++ b/Melawy-Linux-Full/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf @@ -1,4 +1,4 @@ -title Melawy Linux install medium x86_64 UEFI EFI NVIDIA (latest cards only) -sort-key 04 +title Melawy Linux install medium x86_64 UEFI EFI with (Nvidia Drivers. Start from video card Nvidia GTX 900+) +sort-key 04 efi /%INSTALL_DIR%/boot/x86_64/linux-cachyos.efi options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G copytoram=n nvidia nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Full/efiboot/loader/entries/05-archiso-x86_64-linux-nomodeset.conf b/Melawy-Linux-Full/efiboot/loader/entries/05-archiso-x86_64-linux-nomodeset.conf new file mode 100644 index 0000000..be835ce --- /dev/null +++ b/Melawy-Linux-Full/efiboot/loader/entries/05-archiso-x86_64-linux-nomodeset.conf @@ -0,0 +1,7 @@ +title Melawy Linux install medium x86_64 UEFI Default with (Safe mode graphics) +sort-key 05 +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-cachyos.img +options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G copytoram=n driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Full/grub/grub.cfg b/Melawy-Linux-Full/grub/grub.cfg index cc18cab..2abcd5b 100644 --- a/Melawy-Linux-Full/grub/grub.cfg +++ b/Melawy-Linux-Full/grub/grub.cfg @@ -62,28 +62,34 @@ timeout_style=menu # Menu entries -menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} cow_spacesize=10G copytoram=n quiet splash bgrt_disable add_efi_memmap +menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform}) with (Open-Source Drivers)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux' { + set gfxpayload=800x600,1024x768,1366x768,1920x1080 + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} cow_spacesize=10G copytoram=n driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memmap initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img } -menuentry "Melawy Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'Melawy-accessibility' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} accessibility=on cow_spacesize=10G copytoram=n quiet splash bgrt_disable add_efi_memmap +menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform}) with (Nvidia Drivers. Start from video card Nvidia GTX 900+)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with Nvidia' { + set gfxpayload=800x600,1024x768,1366x768,1920x1080 + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} cow_spacesize=10G copytoram=n nvidia nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr quiet splash bgrt_disable add_efi_memmap + initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img +} + +menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform}) with (Safe mode graphics)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with safe mode graphics' { + set gfxpayload=800x600,1024x768,1366x768,1920x1080 + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} cow_spacesize=10G driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 copytoram=n quiet splash bgrt_disable add_efi_memmap initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img } if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { - set gfxpayload=800x600,1024x768 + set gfxpayload=800x600,1024x768,1366x768,1920x1080 linux /boot/memtest86+/memtest.efi } fi if [ "${grub_platform}" == 'pc' -a -f '/boot/memtest86+/memtest' ]; then menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { - set gfxpayload=800x600,1024x768 + set gfxpayload=800x600,1024x768,1366x768,1920x1080 linux /boot/memtest86+/memtest } fi @@ -113,6 +119,5 @@ menuentry 'System restart' --class reboot --class restart { reboot } - # GRUB init tune for accessibility -play 600 988 1 1319 4 +#play 600 988 1 1319 4 diff --git a/Melawy-Linux-Full/grub/loopback.cfg b/Melawy-Linux-Full/grub/loopback.cfg index d64e3da..5e9a621 100644 --- a/Melawy-Linux-Full/grub/loopback.cfg +++ b/Melawy-Linux-Full/grub/loopback.cfg @@ -28,28 +28,34 @@ timeout_style=menu # Menu entries -menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n quiet splash bgrt_disable add_efi_memma +menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform}) with (Open-Source Drivers)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux' { + set gfxpayload=800x600,1024x768,1366x768,1920x1080 + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memma initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img } -menuentry "Melawy Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n quiet splash bgrt_disable add_efi_memmap accessibility=on +menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform}) with (Nvidia Drivers. Start from video card Nvidia GTX 900+)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with Nvidia' { + set gfxpayload=800x600,1024x768,1366x768,1920x1080 + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n nvidia nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr quiet splash bgrt_disable add_efi_memmap + initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img +} + +menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform}) with (Safe mode graphics)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux in safe mode graphics' { + set gfxpayload=800x600,1024x768,1366x768,1920x1080 + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes quiet splash bgrt_disable add_efi_memmap initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img } if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { - set gfxpayload=800x600,1024x768 + set gfxpayload=800x600,1024x768,1366x768,1920x1080 linux /boot/memtest86+/memtest.efi } fi if [ "${grub_platform}" == 'pc' -a -f '/boot/memtest86+/memtest' ]; then menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { - set gfxpayload=800x600,1024x768 + set gfxpayload=800x600,1024x768,1366x768,1920x1080 linux /boot/memtest86+/memtest } fi diff --git a/Melawy-Linux-NetInstall/airootfs/etc/dracut.conf.d/defaults.conf b/Melawy-Linux-NetInstall/airootfs/etc/dracut.conf.d/defaults.conf index ad58786..e549489 100644 --- a/Melawy-Linux-NetInstall/airootfs/etc/dracut.conf.d/defaults.conf +++ b/Melawy-Linux-NetInstall/airootfs/etc/dracut.conf.d/defaults.conf @@ -1,3 +1,3 @@ omit_dracutmodules+=" network cifs nfs brltty " -compress="zstd" +compress="xz" hostonly="no" diff --git a/Melawy-Linux-NetInstall/airootfs/etc/environment b/Melawy-Linux-NetInstall/airootfs/etc/environment index ff3721a..664ebce 100644 --- a/Melawy-Linux-NetInstall/airootfs/etc/environment +++ b/Melawy-Linux-NetInstall/airootfs/etc/environment @@ -13,5 +13,5 @@ #SDL_VIDEODRIVER="wayland,x11" GTK_USE_PORTAL=1 BROWSER=firefox -EDITOR=nano +EDITOR=mcedit ZPOOL_VDEV_NAME_PATH=1 diff --git a/Melawy-Linux-NetInstall/airootfs/etc/motd b/Melawy-Linux-NetInstall/airootfs/etc/motd index 16dedd7..e10b69f 100755 --- a/Melawy-Linux-NetInstall/airootfs/etc/motd +++ b/Melawy-Linux-NetInstall/airootfs/etc/motd @@ -2,7 +2,7 @@ This ISO is based on Arch-ISO modified hugely to provide Installation Environmen https://melawy.ru Melawy Linux-archiso Sources: -https://github.com/Melawy +https://gitlab.com/melawy Arch-ISO Source: https://gitlab.archlinux.org/archlinux/archiso @@ -12,12 +12,12 @@ https://github.com/calamares/calamares Live environment will start now and let you install Melawy Linux to disk, or tryout KDE-Desktop from Live-Session. -Bugs can be reported here: -https://github.com/Melawy +Getting help: +https://melawy.ru +https://sourceforge.net/projects/melawy-linux/support -Getting help: https://Melawy.ru -Chat on telegram: https://t.me/Melawy_chat -News on telegram: https://t.me/Melawy_news +Bugs can be reported here: +https://sourceforge.net/projects/melawy-linux/support Our journey wouldn't be made possible without the donates: https://melawy.ru/donate diff --git a/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/mirrorlist b/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/mirrorlist index e02e5b5..2e302c9 100644 --- a/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/mirrorlist +++ b/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/mirrorlist @@ -3,28 +3,28 @@ ################################################################################ # With: reflector @/etc/xdg/reflector/reflector.conf -# When: 2024-01-01 19:26:36 UTC +# When: 2024-01-06 08:42:28 UTC # From: https://archlinux.org/mirrors/status/json/ -# Retrieved: 2024-01-01 19:26:00 UTC -# Last Check: 2024-01-01 19:23:51 UTC +# Retrieved: 2024-01-06 08:41:50 UTC +# Last Check: 2024-01-06 08:16:26 UTC +Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch +Server = http://mirror.sunred.org/archlinux/$repo/os/$arch Server = https://mirror.f4st.host/archlinux/$repo/os/$arch +Server = http://mirror.f4st.host/archlinux/$repo/os/$arch Server = https://archlinux.thaller.ws/$repo/os/$arch -Server = https://mirror.cyberbits.eu/archlinux/$repo/os/$arch -Server = http://archlinux.thaller.ws/$repo/os/$arch -Server = http://mirror.theo546.fr/archlinux/$repo/os/$arch -Server = https://de.arch.mirror.kescher.at/$repo/os/$arch -Server = https://mirror.theo546.fr/archlinux/$repo/os/$arch -Server = https://mirrors.niyawe.de/archlinux/$repo/os/$arch -Server = http://mirror.moson.org/arch/$repo/os/$arch -Server = http://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch -Server = https://mirror.moson.org/arch/$repo/os/$arch -Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch +Server = http://mirror.cyberbits.eu/archlinux/$repo/os/$arch +Server = https://mirror.sunred.org/archlinux/$repo/os/$arch Server = https://archlinux.mailtunnel.eu/$repo/os/$arch +Server = https://mirror.cyberbits.eu/archlinux/$repo/os/$arch +Server = http://mirror.moson.org/arch/$repo/os/$arch +Server = https://mirror.moson.org/arch/$repo/os/$arch +Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch +Server = http://archlinux.thaller.ws/$repo/os/$arch Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch -Server = rsync://rsync.mirrors.niyawe.de/archlinux/$repo/os/$arch Server = rsync://archlinux.mailtunnel.eu/archlinux/$repo/os/$arch -Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch +Server = rsync://sync.mirror.sunred.org/archlinux/$repo/os/$arch Server = rsync://mirror.moson.org/arch/$repo/os/$arch -Server = rsync://de.arch.mirror.kescher.at/mirror/arch/$repo/os/$arch -Server = rsync://mirror.theo546.fr/archlinux/$repo/os/$arch +Server = http://arch.mirror.far.fi/$repo/os/$arch +Server = rsync://arch.mirror.far.fi/archlinux/$repo/os/$arch +Server = rsync://mirror.f4st.host/archlinux/$repo/os/$arch diff --git a/Melawy-Linux-NetInstall/airootfs/root/.automated_script.sh b/Melawy-Linux-NetInstall/airootfs/root/.automated_script.sh index f257537..2f966d0 100755 --- a/Melawy-Linux-NetInstall/airootfs/root/.automated_script.sh +++ b/Melawy-Linux-NetInstall/airootfs/root/.automated_script.sh @@ -1,21 +1,22 @@ #!/usr/bin/env bash -script_cmdline () -{ +script_cmdline() { local param for param in $(< /proc/cmdline); do case "${param}" in - script=*) echo "${param#*=}" ; return 0 ;; + script=*) + echo "${param#*=}" + return 0 + ;; esac done } -automated_script () -{ +automated_script() { local script rt script="$(script_cmdline)" if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then - if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then + if [[ "${script}" =~ ^((http|https|ftp|tftp)://) ]]; then # there's no synchronization for network availability before executing this script printf '%s: waiting for network-online.target\n' "$0" until systemctl --quiet is-active network-online.target; do diff --git a/Melawy-Linux-NetInstall/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/Melawy-Linux-NetInstall/efiboot/loader/entries/01-archiso-x86_64-linux.conf index 34e732b..7b22819 100644 --- a/Melawy-Linux-NetInstall/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/Melawy-Linux-NetInstall/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,5 +1,5 @@ -title Melawy Linux install medium x86_64 UEFI Default -sort-key 01 +title Melawy Linux install medium x86_64 UEFI with (Open-Source Drivers) +sort-key 01 linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img diff --git a/Melawy-Linux-NetInstall/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf b/Melawy-Linux-NetInstall/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf index b12aa2c..c792346 100644 --- a/Melawy-Linux-NetInstall/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf +++ b/Melawy-Linux-NetInstall/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf @@ -1,5 +1,5 @@ -title Melawy Linux install medium x86_64 UEFI NVIDIA (latest cards only) -sort-key 02 +title Melawy Linux install medium x86_64 UEFI with (Nvidia Drivers. Start from video card Nvidia GTX 900+) +sort-key 02 linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img diff --git a/Melawy-Linux-NetInstall/efiboot/loader/entries/03-archiso-x86_64-efi.conf b/Melawy-Linux-NetInstall/efiboot/loader/entries/03-archiso-x86_64-efi.conf index 95ec9c0..baa3177 100644 --- a/Melawy-Linux-NetInstall/efiboot/loader/entries/03-archiso-x86_64-efi.conf +++ b/Melawy-Linux-NetInstall/efiboot/loader/entries/03-archiso-x86_64-efi.conf @@ -1,4 +1,4 @@ -title Melawy Linux install medium x86_64 UEFI EFI Default -sort-key 03 +title Melawy Linux install medium x86_64 UEFI EFI with (Open-Source Drivers) +sort-key 03 efi /%INSTALL_DIR%/boot/x86_64/linux-cachyos.efi options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-NetInstall/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf b/Melawy-Linux-NetInstall/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf index 36c955d..d55c1fb 100644 --- a/Melawy-Linux-NetInstall/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf +++ b/Melawy-Linux-NetInstall/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf @@ -1,4 +1,4 @@ -title Melawy Linux install medium x86_64 UEFI EFI NVIDIA (latest cards only) -sort-key 04 +title Melawy Linux install medium x86_64 UEFI EFI with (Nvidia Drivers. Start from video card Nvidia GTX 900+) +sort-key 04 efi /%INSTALL_DIR%/boot/x86_64/linux-cachyos.efi options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G copytoram=n nvidia nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-NetInstall/efiboot/loader/entries/05-archiso-x86_64-linux-nomodeset.conf b/Melawy-Linux-NetInstall/efiboot/loader/entries/05-archiso-x86_64-linux-nomodeset.conf new file mode 100644 index 0000000..be835ce --- /dev/null +++ b/Melawy-Linux-NetInstall/efiboot/loader/entries/05-archiso-x86_64-linux-nomodeset.conf @@ -0,0 +1,7 @@ +title Melawy Linux install medium x86_64 UEFI Default with (Safe mode graphics) +sort-key 05 +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-cachyos.img +options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G copytoram=n driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-NetInstall/grub/grub.cfg b/Melawy-Linux-NetInstall/grub/grub.cfg index cc18cab..2abcd5b 100644 --- a/Melawy-Linux-NetInstall/grub/grub.cfg +++ b/Melawy-Linux-NetInstall/grub/grub.cfg @@ -62,28 +62,34 @@ timeout_style=menu # Menu entries -menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} cow_spacesize=10G copytoram=n quiet splash bgrt_disable add_efi_memmap +menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform}) with (Open-Source Drivers)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux' { + set gfxpayload=800x600,1024x768,1366x768,1920x1080 + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} cow_spacesize=10G copytoram=n driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memmap initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img } -menuentry "Melawy Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'Melawy-accessibility' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} accessibility=on cow_spacesize=10G copytoram=n quiet splash bgrt_disable add_efi_memmap +menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform}) with (Nvidia Drivers. Start from video card Nvidia GTX 900+)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with Nvidia' { + set gfxpayload=800x600,1024x768,1366x768,1920x1080 + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} cow_spacesize=10G copytoram=n nvidia nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr quiet splash bgrt_disable add_efi_memmap + initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img +} + +menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform}) with (Safe mode graphics)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with safe mode graphics' { + set gfxpayload=800x600,1024x768,1366x768,1920x1080 + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} cow_spacesize=10G driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 copytoram=n quiet splash bgrt_disable add_efi_memmap initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img } if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { - set gfxpayload=800x600,1024x768 + set gfxpayload=800x600,1024x768,1366x768,1920x1080 linux /boot/memtest86+/memtest.efi } fi if [ "${grub_platform}" == 'pc' -a -f '/boot/memtest86+/memtest' ]; then menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { - set gfxpayload=800x600,1024x768 + set gfxpayload=800x600,1024x768,1366x768,1920x1080 linux /boot/memtest86+/memtest } fi @@ -113,6 +119,5 @@ menuentry 'System restart' --class reboot --class restart { reboot } - # GRUB init tune for accessibility -play 600 988 1 1319 4 +#play 600 988 1 1319 4 diff --git a/Melawy-Linux-NetInstall/grub/loopback.cfg b/Melawy-Linux-NetInstall/grub/loopback.cfg index d64e3da..5e9a621 100644 --- a/Melawy-Linux-NetInstall/grub/loopback.cfg +++ b/Melawy-Linux-NetInstall/grub/loopback.cfg @@ -28,28 +28,34 @@ timeout_style=menu # Menu entries -menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n quiet splash bgrt_disable add_efi_memma +menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform}) with (Open-Source Drivers)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux' { + set gfxpayload=800x600,1024x768,1366x768,1920x1080 + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memma initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img } -menuentry "Melawy Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n quiet splash bgrt_disable add_efi_memmap accessibility=on +menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform}) with (Nvidia Drivers. Start from video card Nvidia GTX 900+)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with Nvidia' { + set gfxpayload=800x600,1024x768,1366x768,1920x1080 + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n nvidia nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr quiet splash bgrt_disable add_efi_memmap + initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img +} + +menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform}) with (Safe mode graphics)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux in safe mode graphics' { + set gfxpayload=800x600,1024x768,1366x768,1920x1080 + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes quiet splash bgrt_disable add_efi_memmap initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img } if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { - set gfxpayload=800x600,1024x768 + set gfxpayload=800x600,1024x768,1366x768,1920x1080 linux /boot/memtest86+/memtest.efi } fi if [ "${grub_platform}" == 'pc' -a -f '/boot/memtest86+/memtest' ]; then menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { - set gfxpayload=800x600,1024x768 + set gfxpayload=800x600,1024x768,1366x768,1920x1080 linux /boot/memtest86+/memtest } fi diff --git a/Melawy-Linux-Tiny/00_mkdirs.sh b/Melawy-Linux-Tiny/00_mkdirs.sh deleted file mode 100755 index 4805a8b..0000000 --- a/Melawy-Linux-Tiny/00_mkdirs.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -edition="$(basename $(pwd))" -mkdir -pv ../boot/{fd,iso,qcow2,shell_scripts,txt} 2>/dev/null -# mkdir -pv ../make_iso 2>/dev/null -mkdir -pv ../sf 2>/dev/null -mkdir -pv ../work_${edition} 2>/dev/null - -echo "Ready" diff --git a/Melawy-Linux-Tiny/00_reset_light.sh b/Melawy-Linux-Tiny/00_reset_light.sh deleted file mode 100755 index 1beeb1d..0000000 --- a/Melawy-Linux-Tiny/00_reset_light.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -edition="$(basename $(pwd))" -sudo rm -rfv ../work_${edition} -status="$?" - -mkdir ../work_${edition} - -notify-send -a "$(basename $(pwd)): Reset" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" - -echo "Ready" -if [ "$status" == 0 ]; then - sleep 5 - kill $(ps x | grep konsole | grep $0 | awk '{print $1}') -fi diff --git a/Melawy-Linux-Tiny/00_reset_with_packages.sh b/Melawy-Linux-Tiny/00_reset_with_packages.sh deleted file mode 100755 index 7d19136..0000000 --- a/Melawy-Linux-Tiny/00_reset_with_packages.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -edition="$(basename $(pwd))" -sudo rm -rfv ../work_${edition} -status="$?" -rm -v airootfs/opt/extra-drivers/*.pkg.tar.* -status=$(( $status + "$?" )) -rm -v airootfs/root/packages/*.pkg.tar.* -status=$(( $status + "$?" )) -rm -v airootfs/usr/share/packages/*.pkg.tar.* -status=$(( $status + "$?" )) - -mkdir ../work_${edition} - -notify-send -a "$(basename $(pwd)): Reset" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" - -echo "Ready" -if [ "$status" == 0 ]; then - sleep 5 - kill $(ps x | grep konsole | grep $0 | awk '{print $1}') -fi diff --git a/Melawy-Linux-Tiny/01_rank_mirrorlist.sh b/Melawy-Linux-Tiny/01_rank_mirrorlist.sh deleted file mode 100755 index fcc2f0d..0000000 --- a/Melawy-Linux-Tiny/01_rank_mirrorlist.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -sudo sed -i -e "s/#Server/Server/g" /etc/pacman.d/mirrorlist.pacnew -sudo cp /etc/pacman.d/mirrorlist.pacnew /etc/pacman.d/mirrorlist -sudo reflector --save /etc/pacman.d/mirrorlist -c "CA,FI,FR,DE,IS,IE,IT,JP,KZ,LV,LU,NZ,NO,PL,PT,RU,SG,ES,SE,CH,TW,TH, " --protocol https --latest 50 --fastest 50 --sort rate - -cp -vf "/etc/pacman.d/mirrorlist" "./airootfs/etc/pacman.d/" - -notify-send -a "$(basename $(pwd)): Prepare" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" - -echo "Ready" -if [ "$status" == 0 ]; then - sleep 5 - kill $(ps x | grep konsole | grep $0 | awk '{print $1}') -fi diff --git a/Melawy-Linux-Tiny/02_prepare.sh b/Melawy-Linux-Tiny/02_prepare.sh deleted file mode 100755 index 8d876d5..0000000 --- a/Melawy-Linux-Tiny/02_prepare.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -cp -vf "/etc/pacman.d/mirrorlist" "./airootfs/etc/pacman.d/" - -sudo pacman -Sy --config pacman_sys.conf - -sudo pacman -Sw --config pacman_sys.conf --noconfirm --cachedir "./airootfs/opt/extra-drivers" r8168-dkms - -# sudo mv -vf "./airootfs/opt/extra-drivers/linux"* "./airootfs/usr/share/packages/" -sudo rm -vf "./airootfs/opt/extra-drivers/linux"* - -packs=( - dracut - grub-dracut - grub - systemd-boot-dracut - libxvmc - linux-api-headers - linux-cachyos - linux-cachyos-headers - linux-cachyos-zfs - melawy-dracut-initramfs - melawy-dracut-ukify - melawy-refind-menu-generator - melawy-refind-theme-nier-a2 - melawy-plymouth-theme-nier-a2 - os-prober - refind - update-grub - xf86-video-intel -) - -for pack in ${packs[@]} -do - sudo pacman -Sw --config pacman_sys.conf --noconfirm --cachedir "./airootfs/usr/share/packages" $pack -done - -sudo paccache -rvk 1 --cachedir "./airootfs/opt/extra-drivers" -sudo paccache -rvk 1 --cachedir "./airootfs/usr/share/packages" - -# sudo rm "./airootfs/opt/extra-drivers/linux"* - -notify-send -a "$(basename $(pwd)): Prepare" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" - -echo "Ready" -if [ "$status" == 0 ]; then - sleep 5 - kill $(ps x | grep konsole | grep $0 | awk '{print $1}') -fi diff --git a/Melawy-Linux-Tiny/03_chown.sh b/Melawy-Linux-Tiny/03_chown.sh deleted file mode 100755 index a924380..0000000 --- a/Melawy-Linux-Tiny/03_chown.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -sudo chown -R 1000:1000 ./airootfs/opt/extra-drivers/ -sudo chown -R 1000:1000 ./airootfs/usr/share/packages/ -sudo chown -R 1000:1000 ../boot/iso - -echo "Ready" -if [ "$status" == 0 ]; then - sleep 5 - kill $(ps x | grep konsole | grep $0 | awk '{print $1}') -fi diff --git a/Melawy-Linux-Tiny/04_make.sh b/Melawy-Linux-Tiny/04_make.sh deleted file mode 100755 index 21e3dde..0000000 --- a/Melawy-Linux-Tiny/04_make.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -edition="$(basename $(pwd))" -date_tag=$(date +%Y.%m.%d) -std_iso_name="Melawy-Linux-${date_tag}-x86_64" -iso_name="${edition}-${date_tag}-x86_64" -iso_dir="${edition}-${date_tag}" - -mkdir -p "../sf/${iso_dir}" -sudo ./mkarchiso_last_my -v "." - -if [ "$?" -eq 0 ]; then - cp -vf "../work_${edition}/iso/arch/pkglist.x86_64.txt" "../sf/${iso_dir}/${iso_name}-pkglist.txt" - - mv "../sf/${iso_dir}/${std_iso_name}.iso" "../sf/${iso_dir}/${iso_name}.iso" - - echo "Sign ../sf/${iso_dir}/${iso_name}.iso.sig ../sf/${iso_dir}/${iso_name}.iso" - if [ -f "../sf/${iso_dir}/${iso_name}.iso.sig" ]; then rm "../sf/${iso_dir}/${iso_name}.iso.sig"; fi - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "../sf/${iso_dir}/${iso_name}.iso.sig" "../sf/${iso_dir}/${iso_name}.iso" - - - cd "../sf/${iso_dir}" - - echo "md5sum ${iso_name}.iso" - md5sum "${iso_name}.iso" > "${iso_name}.iso.md5" - - echo "sha1sum ${iso_name}.iso" - sha1sum "${iso_name}.iso" > "${iso_name}.iso.sha1" - - echo "sha256sum ${iso_name}.iso" - sha256sum "${iso_name}.iso" > "${iso_name}.iso.sha256" - - cd ".." - - mktorrent --verbose --comment="https://melawy.ru" --announce="udp://fosstorrents.com:6969/announce,udp://tracker.opentrackr.org:1337/announce,udp://opentracker.i2p.rocks:6969/announce,udp://open.demonii.com:1337/announce,udp://tracker.openbittorrent.com:6969/announce,http://tracker.openbittorrent.com:80/announce,udp://open.stealth.si:80/announce,udp://tracker.torrent.eu.org:451/announce,udp://exodus.desync.com:6969/announce,udp://tracker1.bt.moack.co.kr:80/announce,udp://tracker.moeking.me:6969/announce,udp://explodie.org:6969/announce,https://tracker.tamersunion.org:443/announce,udp://uploads.gamecoast.net:6969/announce,udp://tracker.tiny-vps.com:6969/announce,udp://tracker.bittor.pw:1337/announce,udp://retracker01-msk-virt.corbina.net:80/announce,udp://movies.zsw.ca:6969/announce,udp://isk.richardsw.club:6969/announce,https://tracker.renfei.net:443/announce,https://tr.burnabyhighstar.com:443/announce,http://fosstorrents.com:6969/announce" --output="${iso_dir}/${iso_name}.torrent" "${iso_dir}" - - notify-send -a "$(basename $(pwd)): Sign" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" - - echo "Ready" - if [ "$status" == 0 ]; then - sleep 5 - kill $(ps x | grep konsole | grep $0 | awk '{print $1}') - fi -fi diff --git a/Melawy-Linux-Tiny/05_sign.sh b/Melawy-Linux-Tiny/05_sign.sh deleted file mode 100755 index f04b5f6..0000000 --- a/Melawy-Linux-Tiny/05_sign.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -edition="$(basename $(pwd))" -date_tag="$(date +%Y.%m.%d)" - -iso_name="${edition}-${date_tag}-x86_64" -iso_dir="${edition}-${date_tag}" - - - - - -cp -vf "../work_${edition}/iso/arch/pkglist.x86_64.txt" "../sf/${iso_dir}/${iso_name}-pkglist.txt" - - - -echo "Sign ../sf/${iso_dir}/${iso_name}.iso.sig ../sf/${iso_dir}/${iso_name}.iso" -if [ -f "../sf/${iso_dir}/${iso_name}.iso.sig" ]; then rm "../sf/${iso_dir}/${iso_name}.iso.sig"; fi -gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "../sf/${iso_dir}/${iso_name}.iso.sig" "../sf/${iso_dir}/${iso_name}.iso" - - -cd "../sf/${iso_dir}" - -echo "md5sum ${iso_name}.iso" -md5sum "${iso_name}.iso" > "${iso_name}.iso.md5" - -echo "sha1sum ${iso_name}.iso" -sha1sum "${iso_name}.iso" > "${iso_name}.iso.sha1" - -echo "sha256sum ${iso_name}.iso" -sha256sum "${iso_name}.iso" > "${iso_name}.iso.sha256" - -cd ".." - -mktorrent --verbose --comment="https://melawy.ru" --announce="udp://fosstorrents.com:6969/announce,udp://tracker.opentrackr.org:1337/announce,udp://opentracker.i2p.rocks:6969/announce,udp://open.demonii.com:1337/announce,udp://tracker.openbittorrent.com:6969/announce,http://tracker.openbittorrent.com:80/announce,udp://open.stealth.si:80/announce,udp://tracker.torrent.eu.org:451/announce,udp://exodus.desync.com:6969/announce,udp://tracker1.bt.moack.co.kr:80/announce,udp://tracker.moeking.me:6969/announce,udp://explodie.org:6969/announce,https://tracker.tamersunion.org:443/announce,udp://uploads.gamecoast.net:6969/announce,udp://tracker.tiny-vps.com:6969/announce,udp://tracker.bittor.pw:1337/announce,udp://retracker01-msk-virt.corbina.net:80/announce,udp://movies.zsw.ca:6969/announce,udp://isk.richardsw.club:6969/announce,https://tracker.renfei.net:443/announce,https://tr.burnabyhighstar.com:443/announce,http://fosstorrents.com:6969/announce" --output="${iso_dir}/${iso_name}.torrent" "${iso_dir}" - -notify-send -a "$(basename $(pwd)): Sign" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" - -echo "Ready" -if [ "$status" == 0 ]; then - sleep 5 - kill $(ps x | grep konsole | grep $0 | awk '{print $1}') -fi diff --git a/Melawy-Linux-Tiny/06_chown.sh b/Melawy-Linux-Tiny/06_chown.sh deleted file mode 100755 index 4834fed..0000000 --- a/Melawy-Linux-Tiny/06_chown.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -sudo chown -R 1000:1000 ../sf - -echo "Ready" -if [ "$status" == 0 ]; then - sleep 5 - kill $(ps x | grep konsole | grep $0 | awk '{print $1}') -fi diff --git a/Melawy-Linux-Tiny/airootfs/etc/dracut.conf.d/defaults.conf b/Melawy-Linux-Tiny/airootfs/etc/dracut.conf.d/defaults.conf index ad58786..e549489 100644 --- a/Melawy-Linux-Tiny/airootfs/etc/dracut.conf.d/defaults.conf +++ b/Melawy-Linux-Tiny/airootfs/etc/dracut.conf.d/defaults.conf @@ -1,3 +1,3 @@ omit_dracutmodules+=" network cifs nfs brltty " -compress="zstd" +compress="xz" hostonly="no" diff --git a/Melawy-Linux-Tiny/airootfs/etc/environment b/Melawy-Linux-Tiny/airootfs/etc/environment index ff3721a..664ebce 100644 --- a/Melawy-Linux-Tiny/airootfs/etc/environment +++ b/Melawy-Linux-Tiny/airootfs/etc/environment @@ -13,5 +13,5 @@ #SDL_VIDEODRIVER="wayland,x11" GTK_USE_PORTAL=1 BROWSER=firefox -EDITOR=nano +EDITOR=mcedit ZPOOL_VDEV_NAME_PATH=1 diff --git a/Melawy-Linux-Tiny/airootfs/etc/motd b/Melawy-Linux-Tiny/airootfs/etc/motd index 16dedd7..e10b69f 100755 --- a/Melawy-Linux-Tiny/airootfs/etc/motd +++ b/Melawy-Linux-Tiny/airootfs/etc/motd @@ -2,7 +2,7 @@ This ISO is based on Arch-ISO modified hugely to provide Installation Environmen https://melawy.ru Melawy Linux-archiso Sources: -https://github.com/Melawy +https://gitlab.com/melawy Arch-ISO Source: https://gitlab.archlinux.org/archlinux/archiso @@ -12,12 +12,12 @@ https://github.com/calamares/calamares Live environment will start now and let you install Melawy Linux to disk, or tryout KDE-Desktop from Live-Session. -Bugs can be reported here: -https://github.com/Melawy +Getting help: +https://melawy.ru +https://sourceforge.net/projects/melawy-linux/support -Getting help: https://Melawy.ru -Chat on telegram: https://t.me/Melawy_chat -News on telegram: https://t.me/Melawy_news +Bugs can be reported here: +https://sourceforge.net/projects/melawy-linux/support Our journey wouldn't be made possible without the donates: https://melawy.ru/donate diff --git a/Melawy-Linux-Tiny/airootfs/etc/pacman.d/mirrorlist b/Melawy-Linux-Tiny/airootfs/etc/pacman.d/mirrorlist index bf4b8a5..2e302c9 100644 --- a/Melawy-Linux-Tiny/airootfs/etc/pacman.d/mirrorlist +++ b/Melawy-Linux-Tiny/airootfs/etc/pacman.d/mirrorlist @@ -3,28 +3,28 @@ ################################################################################ # With: reflector @/etc/xdg/reflector/reflector.conf -# When: 2023-12-23 11:39:24 UTC +# When: 2024-01-06 08:42:28 UTC # From: https://archlinux.org/mirrors/status/json/ -# Retrieved: 2023-12-23 11:38:53 UTC -# Last Check: 2023-12-23 11:12:26 UTC +# Retrieved: 2024-01-06 08:41:50 UTC +# Last Check: 2024-01-06 08:16:26 UTC -Server = https://pkg.adfinis.com/archlinux/$repo/os/$arch -Server = http://mirror.f4st.host/archlinux/$repo/os/$arch -Server = https://mirror.sunred.org/archlinux/$repo/os/$arch +Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch Server = http://mirror.sunred.org/archlinux/$repo/os/$arch -Server = https://archlinux.mailtunnel.eu/$repo/os/$arch -Server = http://pkg.adfinis.com/archlinux/$repo/os/$arch -Server = https://archlinux.thaller.ws/$repo/os/$arch -Server = http://mirror.ubrco.de/archlinux/$repo/os/$arch -Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch -Server = http://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch -Server = http://archlinux.thaller.ws/$repo/os/$arch -Server = https://mirror.moson.org/arch/$repo/os/$arch -Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch Server = https://mirror.f4st.host/archlinux/$repo/os/$arch -Server = rsync://sync.mirror.sunred.org/archlinux/$repo/os/$arch +Server = http://mirror.f4st.host/archlinux/$repo/os/$arch +Server = https://archlinux.thaller.ws/$repo/os/$arch +Server = http://mirror.cyberbits.eu/archlinux/$repo/os/$arch +Server = https://mirror.sunred.org/archlinux/$repo/os/$arch +Server = https://archlinux.mailtunnel.eu/$repo/os/$arch +Server = https://mirror.cyberbits.eu/archlinux/$repo/os/$arch +Server = http://mirror.moson.org/arch/$repo/os/$arch +Server = https://mirror.moson.org/arch/$repo/os/$arch +Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch +Server = http://archlinux.thaller.ws/$repo/os/$arch Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch -Server = rsync://pkg.adfinis.com/archlinux/$repo/os/$arch -Server = rsync://mirror.ubrco.de/archlinux/$repo/os/$arch Server = rsync://archlinux.mailtunnel.eu/archlinux/$repo/os/$arch +Server = rsync://sync.mirror.sunred.org/archlinux/$repo/os/$arch +Server = rsync://mirror.moson.org/arch/$repo/os/$arch +Server = http://arch.mirror.far.fi/$repo/os/$arch +Server = rsync://arch.mirror.far.fi/archlinux/$repo/os/$arch Server = rsync://mirror.f4st.host/archlinux/$repo/os/$arch diff --git a/Melawy-Linux-Tiny/airootfs/root/.automated_script.sh b/Melawy-Linux-Tiny/airootfs/root/.automated_script.sh index f257537..2f966d0 100755 --- a/Melawy-Linux-Tiny/airootfs/root/.automated_script.sh +++ b/Melawy-Linux-Tiny/airootfs/root/.automated_script.sh @@ -1,21 +1,22 @@ #!/usr/bin/env bash -script_cmdline () -{ +script_cmdline() { local param for param in $(< /proc/cmdline); do case "${param}" in - script=*) echo "${param#*=}" ; return 0 ;; + script=*) + echo "${param#*=}" + return 0 + ;; esac done } -automated_script () -{ +automated_script() { local script rt script="$(script_cmdline)" if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then - if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then + if [[ "${script}" =~ ^((http|https|ftp|tftp)://) ]]; then # there's no synchronization for network availability before executing this script printf '%s: waiting for network-online.target\n' "$0" until systemctl --quiet is-active network-online.target; do diff --git a/Melawy-Linux-Tiny/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/Melawy-Linux-Tiny/efiboot/loader/entries/01-archiso-x86_64-linux.conf index 34e732b..7b22819 100644 --- a/Melawy-Linux-Tiny/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/Melawy-Linux-Tiny/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,5 +1,5 @@ -title Melawy Linux install medium x86_64 UEFI Default -sort-key 01 +title Melawy Linux install medium x86_64 UEFI with (Open-Source Drivers) +sort-key 01 linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img diff --git a/Melawy-Linux-Tiny/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf b/Melawy-Linux-Tiny/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf index b12aa2c..c792346 100644 --- a/Melawy-Linux-Tiny/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf +++ b/Melawy-Linux-Tiny/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf @@ -1,5 +1,5 @@ -title Melawy Linux install medium x86_64 UEFI NVIDIA (latest cards only) -sort-key 02 +title Melawy Linux install medium x86_64 UEFI with (Nvidia Drivers. Start from video card Nvidia GTX 900+) +sort-key 02 linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img diff --git a/Melawy-Linux-Tiny/efiboot/loader/entries/03-archiso-x86_64-efi.conf b/Melawy-Linux-Tiny/efiboot/loader/entries/03-archiso-x86_64-efi.conf index 95ec9c0..baa3177 100644 --- a/Melawy-Linux-Tiny/efiboot/loader/entries/03-archiso-x86_64-efi.conf +++ b/Melawy-Linux-Tiny/efiboot/loader/entries/03-archiso-x86_64-efi.conf @@ -1,4 +1,4 @@ -title Melawy Linux install medium x86_64 UEFI EFI Default -sort-key 03 +title Melawy Linux install medium x86_64 UEFI EFI with (Open-Source Drivers) +sort-key 03 efi /%INSTALL_DIR%/boot/x86_64/linux-cachyos.efi options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Tiny/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf b/Melawy-Linux-Tiny/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf index 36c955d..d55c1fb 100644 --- a/Melawy-Linux-Tiny/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf +++ b/Melawy-Linux-Tiny/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf @@ -1,4 +1,4 @@ -title Melawy Linux install medium x86_64 UEFI EFI NVIDIA (latest cards only) -sort-key 04 +title Melawy Linux install medium x86_64 UEFI EFI with (Nvidia Drivers. Start from video card Nvidia GTX 900+) +sort-key 04 efi /%INSTALL_DIR%/boot/x86_64/linux-cachyos.efi options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G copytoram=n nvidia nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Tiny/efiboot/loader/entries/05-archiso-x86_64-linux-nomodeset.conf b/Melawy-Linux-Tiny/efiboot/loader/entries/05-archiso-x86_64-linux-nomodeset.conf new file mode 100644 index 0000000..be835ce --- /dev/null +++ b/Melawy-Linux-Tiny/efiboot/loader/entries/05-archiso-x86_64-linux-nomodeset.conf @@ -0,0 +1,7 @@ +title Melawy Linux install medium x86_64 UEFI Default with (Safe mode graphics) +sort-key 05 +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-cachyos.img +options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G copytoram=n driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes quiet splash bgrt_disable add_efi_memmap diff --git a/Melawy-Linux-Tiny/grub/grub.cfg b/Melawy-Linux-Tiny/grub/grub.cfg index cc18cab..2abcd5b 100644 --- a/Melawy-Linux-Tiny/grub/grub.cfg +++ b/Melawy-Linux-Tiny/grub/grub.cfg @@ -62,28 +62,34 @@ timeout_style=menu # Menu entries -menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} cow_spacesize=10G copytoram=n quiet splash bgrt_disable add_efi_memmap +menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform}) with (Open-Source Drivers)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux' { + set gfxpayload=800x600,1024x768,1366x768,1920x1080 + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} cow_spacesize=10G copytoram=n driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memmap initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img } -menuentry "Melawy Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'Melawy-accessibility' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} accessibility=on cow_spacesize=10G copytoram=n quiet splash bgrt_disable add_efi_memmap +menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform}) with (Nvidia Drivers. Start from video card Nvidia GTX 900+)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with Nvidia' { + set gfxpayload=800x600,1024x768,1366x768,1920x1080 + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} cow_spacesize=10G copytoram=n nvidia nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr quiet splash bgrt_disable add_efi_memmap + initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img +} + +menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform}) with (Safe mode graphics)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with safe mode graphics' { + set gfxpayload=800x600,1024x768,1366x768,1920x1080 + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} cow_spacesize=10G driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 copytoram=n quiet splash bgrt_disable add_efi_memmap initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img } if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { - set gfxpayload=800x600,1024x768 + set gfxpayload=800x600,1024x768,1366x768,1920x1080 linux /boot/memtest86+/memtest.efi } fi if [ "${grub_platform}" == 'pc' -a -f '/boot/memtest86+/memtest' ]; then menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { - set gfxpayload=800x600,1024x768 + set gfxpayload=800x600,1024x768,1366x768,1920x1080 linux /boot/memtest86+/memtest } fi @@ -113,6 +119,5 @@ menuentry 'System restart' --class reboot --class restart { reboot } - # GRUB init tune for accessibility -play 600 988 1 1319 4 +#play 600 988 1 1319 4 diff --git a/Melawy-Linux-Tiny/grub/loopback.cfg b/Melawy-Linux-Tiny/grub/loopback.cfg index d64e3da..5e9a621 100644 --- a/Melawy-Linux-Tiny/grub/loopback.cfg +++ b/Melawy-Linux-Tiny/grub/loopback.cfg @@ -28,28 +28,34 @@ timeout_style=menu # Menu entries -menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n quiet splash bgrt_disable add_efi_memma +menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform}) with (Open-Source Drivers)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux' { + set gfxpayload=800x600,1024x768,1366x768,1920x1080 + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes quiet splash bgrt_disable add_efi_memma initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img } -menuentry "Melawy Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n quiet splash bgrt_disable add_efi_memmap accessibility=on +menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform}) with (Nvidia Drivers. Start from video card Nvidia GTX 900+)" --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux with Nvidia' { + set gfxpayload=800x600,1024x768,1366x768,1920x1080 + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n nvidia nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr quiet splash bgrt_disable add_efi_memmap + initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img +} + +menuentry "Melawy Linux install medium (%ARCH%, ${archiso_platform}) with (Safe mode graphics)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'Melawy Linux in safe mode graphics' { + set gfxpayload=800x600,1024x768,1366x768,1920x1080 + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes quiet splash bgrt_disable add_efi_memmap initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img } if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { - set gfxpayload=800x600,1024x768 + set gfxpayload=800x600,1024x768,1366x768,1920x1080 linux /boot/memtest86+/memtest.efi } fi if [ "${grub_platform}" == 'pc' -a -f '/boot/memtest86+/memtest' ]; then menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { - set gfxpayload=800x600,1024x768 + set gfxpayload=800x600,1024x768,1366x768,1920x1080 linux /boot/memtest86+/memtest } fi diff --git a/clear.sh b/clear.sh old mode 100644 new mode 100755 diff --git a/make.sh b/make.sh old mode 100644 new mode 100755