Installer
/
melawy-archiso-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update

This commit is contained in:
Valeria Fadeeva 2024-01-14 14:41:07 +05:00
parent e420c48f69
commit 537980e484
20 changed files with 81 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Melawy-Linux-Full/airootfs/etc/pacman-cache.conf
View File

@ -102,7 +102,7 @@ Include = /etc/pacman.d/cachyos-mirrorlist
[cache]
SigLevel = Optional
Server = http://10.120.152.1/$repo/$arch
#Server = http://10.120.152.1/$repo/$arch
Server = http://192.168.1.250/$repo/$arch
Server = https://repo.melawy.ru/$repo/$arch

4
Melawy-Linux-Full/efiboot/loader/entries/03-archiso-x86_64-efi.conf
View File

@ -1,4 +0,0 @@
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

4
Melawy-Linux-Full/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf
View File

@ -1,4 +0,0 @@
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

6
Melawy-Linux-Full/mkarchiso_last_my
View File

@ -441,7 +441,6 @@ _make_boot_on_iso9660() {
install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/${arch}"
install -m 0644 -- "${pacstrap_dir}/boot/initramfs-"*".img" "${isofs_dir}/${install_dir}/boot/${arch}/"
install -m 0644 -- "${pacstrap_dir}/boot/vmlinuz-"* "${isofs_dir}/${install_dir}/boot/${arch}/"
install -m 0644 -- "${pacstrap_dir}/boot/linux-"* "${isofs_dir}/${install_dir}/boot/${arch}/"
for ucode_image in "${ucodes[@]}"; do
if [[ -e "${pacstrap_dir}/boot/${ucode_image}" ]]; then
@ -516,9 +515,7 @@ _make_boot_on_fat() {
mmd -i "${efibootimg}" \
"::/${install_dir}" "::/${install_dir}/boot" "::/${install_dir}/boot/${arch}"
mcopy -i "${efibootimg}" "${pacstrap_dir}/boot/vmlinuz-"* \
"${pacstrap_dir}/boot/initramfs-"*".img" \
"${pacstrap_dir}/boot/linux-"* \
"::/${install_dir}/boot/${arch}/"
"${pacstrap_dir}/boot/initramfs-"*".img" "::/${install_dir}/boot/${arch}/"
for ucode_image in "${ucodes[@]}"; do
if [[ -e "${pacstrap_dir}/boot/${ucode_image}" ]]; then
all_ucode_images+=("${pacstrap_dir}/boot/${ucode_image}")
@ -865,7 +862,6 @@ _make_common_bootmode_systemd-boot() {
efiboot_files+=("${work_dir}/loader/"
"${pacstrap_dir}/boot/vmlinuz-"*
"${pacstrap_dir}/boot/initramfs-"*".img"
"${pacstrap_dir}/boot/linux-"*
"${_available_ucodes[@]}")
efiboot_imgsize="$(du -bcs -- "${efiboot_files[@]}" 2>/dev/null | awk 'END { print $1 }')"
# Create a FAT image for the EFI system partition

2
Melawy-Linux-NetInstall/airootfs/etc/pacman-cache.conf
View File

@ -102,7 +102,7 @@ Include = /etc/pacman.d/cachyos-mirrorlist
[cache]
SigLevel = Optional
Server = http://10.120.152.1/$repo/$arch
#Server = http://10.120.152.1/$repo/$arch
Server = http://192.168.1.250/$repo/$arch
Server = https://repo.melawy.ru/$repo/$arch

28
Melawy-Linux-NetInstall/airootfs/etc/pacman.d/mirrorlist
View File

@ -3,28 +3,28 @@
################################################################################
# With: reflector @/etc/xdg/reflector/reflector.conf
# When: 2024-01-07 12:54:57 UTC
# When: 2024-01-08 07:47:52 UTC
# From: https://archlinux.org/mirrors/status/json/
# Retrieved: 2024-01-07 12:54:28 UTC
# Last Check: 2024-01-07 12:50:15 UTC
# Retrieved: 2024-01-08 07:47:24 UTC
# Last Check: 2024-01-08 07:32:49 UTC
Server = https://mirror.f4st.host/archlinux/$repo/os/$arch
Server = http://mirror.sunred.org/archlinux/$repo/os/$arch
Server = https://mirror.sunred.org/archlinux/$repo/os/$arch
Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch
Server = https://mirror.pseudoform.org/$repo/os/$arch
Server = http://mirror.f4st.host/archlinux/$repo/os/$arch
Server = http://mirror.cyberbits.eu/archlinux/$repo/os/$arch
Server = https://mirror.theo546.fr/archlinux/$repo/os/$arch
Server = https://archlinux.thaller.ws/$repo/os/$arch
Server = https://mirror.pseudoform.org/$repo/os/$arch
Server = http://mirror.theo546.fr/archlinux/$repo/os/$arch
Server = http://mirror.cyberbits.eu/archlinux/$repo/os/$arch
Server = https://mirror.sunred.org/archlinux/$repo/os/$arch
Server = https://mirror.cyberbits.eu/archlinux/$repo/os/$arch
Server = http://mirror.moson.org/arch/$repo/os/$arch
Server = https://archlinux.mailtunnel.eu/$repo/os/$arch
Server = http://mirror.sunred.org/archlinux/$repo/os/$arch
Server = http://archlinux.thaller.ws/$repo/os/$arch
Server = https://mirror.moson.org/arch/$repo/os/$arch
Server = rsync://archlinux.mailtunnel.eu/archlinux/$repo/os/$arch
Server = rsync://rsync.cyberbits.eu/archlinux/$repo/os/$arch
Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch
Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch
Server = rsync://mirror.theo546.fr/archlinux/$repo/os/$arch
Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch
Server = rsync://mirror.f4st.host/archlinux/$repo/os/$arch
Server = rsync://rsync.cyberbits.eu/archlinux/$repo/os/$arch
Server = https://archmirror.it/repos/$repo/os/$arch
Server = rsync://mirror.moson.org/arch/$repo/os/$arch
Server = rsync://sync.mirror.sunred.org/archlinux/$repo/os/$arch
Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch

4
Melawy-Linux-NetInstall/efiboot/loader/entries/03-archiso-x86_64-efi.conf
View File

@ -1,4 +0,0 @@
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

4
Melawy-Linux-NetInstall/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf
View File

@ -1,4 +0,0 @@
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

6
Melawy-Linux-NetInstall/mkarchiso_last_my
View File

@ -441,7 +441,6 @@ _make_boot_on_iso9660() {
install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/${arch}"
install -m 0644 -- "${pacstrap_dir}/boot/initramfs-"*".img" "${isofs_dir}/${install_dir}/boot/${arch}/"
install -m 0644 -- "${pacstrap_dir}/boot/vmlinuz-"* "${isofs_dir}/${install_dir}/boot/${arch}/"
install -m 0644 -- "${pacstrap_dir}/boot/linux-"* "${isofs_dir}/${install_dir}/boot/${arch}/"
for ucode_image in "${ucodes[@]}"; do
if [[ -e "${pacstrap_dir}/boot/${ucode_image}" ]]; then
@ -516,9 +515,7 @@ _make_boot_on_fat() {
mmd -i "${efibootimg}" \
"::/${install_dir}" "::/${install_dir}/boot" "::/${install_dir}/boot/${arch}"
mcopy -i "${efibootimg}" "${pacstrap_dir}/boot/vmlinuz-"* \
"${pacstrap_dir}/boot/initramfs-"*".img" \
"${pacstrap_dir}/boot/linux-"* \
"::/${install_dir}/boot/${arch}/"
"${pacstrap_dir}/boot/initramfs-"*".img" "::/${install_dir}/boot/${arch}/"
for ucode_image in "${ucodes[@]}"; do
if [[ -e "${pacstrap_dir}/boot/${ucode_image}" ]]; then
all_ucode_images+=("${pacstrap_dir}/boot/${ucode_image}")
@ -865,7 +862,6 @@ _make_common_bootmode_systemd-boot() {
efiboot_files+=("${work_dir}/loader/"
"${pacstrap_dir}/boot/vmlinuz-"*
"${pacstrap_dir}/boot/initramfs-"*".img"
"${pacstrap_dir}/boot/linux-"*
"${_available_ucodes[@]}")
efiboot_imgsize="$(du -bcs -- "${efiboot_files[@]}" 2>/dev/null | awk 'END { print $1 }')"
# Create a FAT image for the EFI system partition

2
Melawy-Linux-Tiny/airootfs/etc/pacman-cache.conf
View File

@ -102,7 +102,7 @@ Include = /etc/pacman.d/cachyos-mirrorlist
[cache]
SigLevel = Optional
Server = http://10.120.152.1/$repo/$arch
#Server = http://10.120.152.1/$repo/$arch
Server = http://192.168.1.250/$repo/$arch
Server = https://repo.melawy.ru/$repo/$arch

28
Melawy-Linux-Tiny/airootfs/etc/pacman.d/mirrorlist
View File

@ -3,28 +3,28 @@
################################################################################
# With: reflector @/etc/xdg/reflector/reflector.conf
# When: 2024-01-07 12:54:57 UTC
# When: 2024-01-08 07:47:52 UTC
# From: https://archlinux.org/mirrors/status/json/
# Retrieved: 2024-01-07 12:54:28 UTC
# Last Check: 2024-01-07 12:50:15 UTC
# Retrieved: 2024-01-08 07:47:24 UTC
# Last Check: 2024-01-08 07:32:49 UTC
Server = https://mirror.f4st.host/archlinux/$repo/os/$arch
Server = http://mirror.sunred.org/archlinux/$repo/os/$arch
Server = https://mirror.sunred.org/archlinux/$repo/os/$arch
Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch
Server = https://mirror.pseudoform.org/$repo/os/$arch
Server = http://mirror.f4st.host/archlinux/$repo/os/$arch
Server = http://mirror.cyberbits.eu/archlinux/$repo/os/$arch
Server = https://mirror.theo546.fr/archlinux/$repo/os/$arch
Server = https://archlinux.thaller.ws/$repo/os/$arch
Server = https://mirror.pseudoform.org/$repo/os/$arch
Server = http://mirror.theo546.fr/archlinux/$repo/os/$arch
Server = http://mirror.cyberbits.eu/archlinux/$repo/os/$arch
Server = https://mirror.sunred.org/archlinux/$repo/os/$arch
Server = https://mirror.cyberbits.eu/archlinux/$repo/os/$arch
Server = http://mirror.moson.org/arch/$repo/os/$arch
Server = https://archlinux.mailtunnel.eu/$repo/os/$arch
Server = http://mirror.sunred.org/archlinux/$repo/os/$arch
Server = http://archlinux.thaller.ws/$repo/os/$arch
Server = https://mirror.moson.org/arch/$repo/os/$arch
Server = rsync://archlinux.mailtunnel.eu/archlinux/$repo/os/$arch
Server = rsync://rsync.cyberbits.eu/archlinux/$repo/os/$arch
Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch
Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch
Server = rsync://mirror.theo546.fr/archlinux/$repo/os/$arch
Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch
Server = rsync://mirror.f4st.host/archlinux/$repo/os/$arch
Server = rsync://rsync.cyberbits.eu/archlinux/$repo/os/$arch
Server = https://archmirror.it/repos/$repo/os/$arch
Server = rsync://mirror.moson.org/arch/$repo/os/$arch
Server = rsync://sync.mirror.sunred.org/archlinux/$repo/os/$arch
Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch

4
Melawy-Linux-Tiny/efiboot/loader/entries/03-archiso-x86_64-efi.conf
View File

@ -1,4 +0,0 @@
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

4
Melawy-Linux-Tiny/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf
View File

@ -1,4 +0,0 @@
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

6
Melawy-Linux-Tiny/mkarchiso_last_my
View File

@ -441,7 +441,6 @@ _make_boot_on_iso9660() {
install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/${arch}"
install -m 0644 -- "${pacstrap_dir}/boot/initramfs-"*".img" "${isofs_dir}/${install_dir}/boot/${arch}/"
install -m 0644 -- "${pacstrap_dir}/boot/vmlinuz-"* "${isofs_dir}/${install_dir}/boot/${arch}/"
install -m 0644 -- "${pacstrap_dir}/boot/linux-"* "${isofs_dir}/${install_dir}/boot/${arch}/"
for ucode_image in "${ucodes[@]}"; do
if [[ -e "${pacstrap_dir}/boot/${ucode_image}" ]]; then
@ -516,9 +515,7 @@ _make_boot_on_fat() {
mmd -i "${efibootimg}" \
"::/${install_dir}" "::/${install_dir}/boot" "::/${install_dir}/boot/${arch}"
mcopy -i "${efibootimg}" "${pacstrap_dir}/boot/vmlinuz-"* \
"${pacstrap_dir}/boot/initramfs-"*".img" \
"${pacstrap_dir}/boot/linux-"* \
"::/${install_dir}/boot/${arch}/"
"${pacstrap_dir}/boot/initramfs-"*".img" "::/${install_dir}/boot/${arch}/"
for ucode_image in "${ucodes[@]}"; do
if [[ -e "${pacstrap_dir}/boot/${ucode_image}" ]]; then
all_ucode_images+=("${pacstrap_dir}/boot/${ucode_image}")
@ -865,7 +862,6 @@ _make_common_bootmode_systemd-boot() {
efiboot_files+=("${work_dir}/loader/"
"${pacstrap_dir}/boot/vmlinuz-"*
"${pacstrap_dir}/boot/initramfs-"*".img"
"${pacstrap_dir}/boot/linux-"*
"${_available_ucodes[@]}")
efiboot_imgsize="$(du -bcs -- "${efiboot_files[@]}" 2>/dev/null | awk 'END { print $1 }')"
# Create a FAT image for the EFI system partition

7
make.sh
View File

@ -143,10 +143,17 @@ function build() {
fi
rm -rfv "$CWD/work_${edition}"
mkdir -pv "$CWD/boot/"{fd,iso,qcow2,shell_scripts,txt} 2>/dev/null
chown -R 1000:1000 "$CWD/boot/"
mkdir -pv "$CWD/sf" 2>/dev/null
chown -R 1000:1000 "$CWD/sf"
mkdir -pv "$CWD/work_${edition}" 2>/dev/null
mkdir -pv "$CWD/sf/${iso_dir}" 2>/dev/null
chown -R 1000:1000 "$CWD/sf/${iso_dir}"
cp -vf "/etc/pacman.d/mirrorlist" "./airootfs/etc/pacman.d/"

2
pwd.txt
View File

@ -1 +1 @@
/data/data/melawy-archiso-config
/data/github/active/Melawy/Melawy-Dev/MELAWY/Installer/melawy-archiso-config

11
rsync.full.sh
View File

@ -1,5 +1,7 @@
#!/bin/bash
status=0
ip1="10.120.152.1"
ip2="192.168.1.250"
@ -19,11 +21,12 @@ fi
if [[ -n "$ip" ]]; then
echo "Sending"
rsync -avP --progress -e "ssh" $(find ./sf -type d -iname "*full*") "${ip}:/var/lib/transmission/Downloads/"
rsync -avP --progress -e "ssh" $(find ./sf -type d -iname "*full*") "${ip}:/var/www/www/transmission/downloads/"
status=$?
for i in $(find "./sf/" -name "*.torrent")
do
rsync -avP --delete-after --progress -e "ssh" "$i" "${ip}:/var/lib/transmission/torrents/"
rsync -avP --delete-after --progress -e "ssh" "$i" "${ip}:/var/www/www/transmission/torrents/"
status=$(( $status + $? ))
done
fi
@ -31,5 +34,9 @@ fi
echo "Ready"
if [ "$status" == 0 ]; then
sleep 5
process=$(ps x | grep konsole | grep $0 | awk '{print $1}')
if [ $(( "$process" + 0 )) -ne 0 ]; then
kill $(ps x | grep konsole | grep $0 | awk '{print $1}')
fi
fi

11
rsync.netinstall.sh
View File

@ -1,5 +1,7 @@
#!/bin/bash
status=0
ip1="10.120.152.1"
ip2="192.168.1.250"
@ -19,11 +21,12 @@ fi
if [[ -n "$ip" ]]; then
echo "Sending"
rsync -avP --progress -e "ssh" $(find ./sf -type d -iname "*netinstall*") "${ip}:/var/lib/transmission/Downloads/"
rsync -avP --progress -e "ssh" $(find ./sf -type d -iname "*netinstall*") "${ip}:/var/www/www/transmission/downloads/"
status=$?
for i in $(find "./sf/" -name "*.torrent")
do
rsync -avP --delete-after --progress -e "ssh" "$i" "${ip}:/var/lib/transmission/torrents/"
rsync -avP --delete-after --progress -e "ssh" "$i" "${ip}:/var/www/www/transmission/torrents/"
status=$(( $status + $? ))
done
fi
@ -31,5 +34,9 @@ fi
echo "Ready"
if [ "$status" == 0 ]; then
sleep 5
process=$(ps x | grep konsole | grep $0 | awk '{print $1}')
if [ $(( "$process" + 0 )) -ne 0 ]; then
kill $(ps x | grep konsole | grep $0 | awk '{print $1}')
fi
fi

11
rsync.tiny.sh
View File

@ -1,5 +1,7 @@
#!/bin/bash
status=0
ip1="10.120.152.1"
ip2="192.168.1.250"
@ -19,11 +21,12 @@ fi
if [[ -n "$ip" ]]; then
echo "Sending"
rsync -avP --progress -e "ssh" $(find ./sf -type d -iname "*tiny*") "${ip}:/var/lib/transmission/Downloads/"
rsync -avP --progress -e "ssh" $(find ./sf -type d -iname "*tiny*") "${ip}:/var/www/www/transmission/downloads/"
status=$?
for i in $(find "./sf/" -name "*.torrent")
do
rsync -avP --delete-after --progress -e "ssh" "$i" "${ip}:/var/lib/transmission/torrents/"
rsync -avP --delete-after --progress -e "ssh" "$i" "${ip}:/var/www/www/transmission/torrents/"
status=$(( $status + $? ))
done
fi
@ -31,5 +34,9 @@ fi
echo "Ready"
if [ "$status" == 0 ]; then
sleep 5
process=$(ps x | grep konsole | grep $0 | awk '{print $1}')
if [ $(( "$process" + 0 )) -ne 0 ]; then
kill $(ps x | grep konsole | grep $0 | awk '{print $1}')
fi
fi

10
rsync_to_home.sh
View File

@ -1,5 +1,7 @@
#!/bin/bash
status=0
ip1="10.120.152.1"
ip2="192.168.1.250"
@ -19,12 +21,12 @@ fi
if [[ -n "$ip" ]]; then
echo "Sending"
rsync -avP --delete-after --progress -e "ssh" "./sf/" "${ip}:/var/lib/transmission/Downloads/"
rsync -avP --delete-after --progress -e "ssh" "./sf/" "${ip}:/var/www/www/transmission/downloads/"
status=$?
for i in $(find "./sf/" -name "*.torrent")
do
rsync -avP --delete-after --progress -e "ssh" "$i" "${ip}:/var/lib/transmission/torrents/"
rsync -avP --delete-after --progress -e "ssh" "$i" "${ip}:/var/www/www/transmission/torrents/"
status=$(( $status + $? ))
done
fi
@ -32,5 +34,9 @@ fi
echo "Ready"
if [ "$status" == 0 ]; then
sleep 5
process=$(ps x | grep konsole | grep $0 | awk '{print $1}')
if [ $(( "$process" + 0 )) -ne 0 ]; then
kill $(ps x | grep konsole | grep $0 | awk '{print $1}')
fi
fi