diff --git a/01_prepare.sh b/01_prepare.sh index b8d7f1a..3f16b90 100755 --- a/01_prepare.sh +++ b/01_prepare.sh @@ -1,16 +1,20 @@ #!/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,http,rsync --latest 50 --fastest 50 --sort rate + cp -vf "/etc/pacman.d/mirrorlist" "./airootfs/etc/pacman.d/" sudo pacman -Sy -sudo pacman -Sw --noconfirm --cachedir "./airootfs/opt/extra-drivers" r8168 +sudo pacman -Sw --config pacman_sys.conf --noconfirm --cachedir "./airootfs/opt/extra-drivers" r8168 packs=( dracut - eos-dracut + grub-dracut grub - kernel-install-for-dracut + systemd-boot-dracut libxvmc linux linux-api-headers @@ -30,7 +34,7 @@ packs=( for pack in ${packs[@]} do - sudo pacman -Sw --noconfirm --cachedir "./airootfs/usr/share/packages" $pack + sudo pacman -Sw --config pacman_sys.conf --noconfirm --cachedir "./airootfs/usr/share/packages" $pack done sudo paccache -rvk 1 --cachedir "./airootfs/opt/extra-drivers" diff --git a/airootfs/etc/pacman.d/mirrorlist b/airootfs/etc/pacman.d/mirrorlist index 86c9b18..dae19b0 100644 --- a/airootfs/etc/pacman.d/mirrorlist +++ b/airootfs/etc/pacman.d/mirrorlist @@ -1,88 +1,60 @@ -Server = http://md.mirrors.hacktegic.com/archlinux/$repo/os/$arch -Server = http://mirror.kumi.systems/archlinux/$repo/os/$arch -Server = http://arch.yhtez.xyz/$repo/os/$arch -Server = http://pkg.adfinis.com/archlinux/$repo/os/$arch -Server = http://mirror.cspacehostings.com/archlinux/$repo/os/$arch -Server = http://archlinux.uk.mirror.allworldit.com/archlinux/$repo/os/$arch -Server = http://ftp.acc.umu.se/mirror/archlinux/$repo/os/$arch -Server = http://ftp.psnc.pl/linux/archlinux/$repo/os/$arch -Server = http://mirror.selfnet.de/archlinux/$repo/os/$arch -Server = http://mirror.archlinux.no/$repo/os/$arch -Server = https://mirror.archlinux.no/$repo/os/$arch -Server = http://mirrors.xtom.ee/archlinux/$repo/os/$arch -Server = https://europe.mirror.pkgbuild.com/$repo/os/$arch -Server = https://london.mirror.pkgbuild.com/$repo/os/$arch -Server = http://mirrors.qontinuum.space/archlinux/$repo/os/$arch -Server = https://arch.yhtez.xyz/$repo/os/$arch -Server = http://mirror.alwyzon.net/archlinux/$repo/os/$arch -Server = http://ftp.fau.de/archlinux/$repo/os/$arch -Server = http://mirror.juniorjpdj.pl/archlinux/$repo/os/$arch -Server = https://mirror.wuki.li/archlinux/$repo/os/$arch -Server = http://mirrors.atviras.lt/archlinux/$repo/os/$arch -Server = http://mirror.sahil.world/archlinux/$repo/os/$arch -Server = https://mirror.cspacehostings.com/archlinux/$repo/os/$arch -Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch -Server = http://mirror.bahnhof.net/pub/archlinux/$repo/os/$arch -Server = http://ftp.byfly.by/pub/archlinux/$repo/os/$arch -Server = https://mirrors.xtom.ee/archlinux/$repo/os/$arch -Server = https://mirror.kumi.systems/archlinux/$repo/os/$arch -Server = http://mirror.cyberbits.eu/archlinux/$repo/os/$arch -Server = http://mirror.vinehost.net/archlinux/$repo/os/$arch +################################################################################ +################# Arch Linux mirrorlist generated by Reflector ################# +################################################################################ + +# With: 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,http,rsync --latest 50 --fastest 50 --sort rate +# When: 2023-11-04 21:36:16 UTC +# From: https://archlinux.org/mirrors/status/json/ +# Retrieved: 2023-11-04 21:34:31 UTC +# Last Check: 2023-11-04 21:17:09 UTC + Server = http://arch.mirror.far.fi/$repo/os/$arch -Server = https://mirror.worldhotspot.org/archlinux/$repo/os/$arch -Server = https://mirrors.atviras.lt/archlinux/$repo/os/$arch -Server = https://md.mirrors.hacktegic.com/archlinux/$repo/os/$arch -Server = http://mirror.one.com/archlinux/$repo/os/$arch -Server = http://arch.midov.pl/arch/$repo/os/$arch -Server = http://mirror.0xem.ma/arch/$repo/os/$arch -Server = http://mirrors.nic.cz/archlinux/$repo/os/$arch -Server = http://mirror.telepoint.bg/archlinux/$repo/os/$arch -Server = http://mirrors.melbourne.co.uk/archlinux/$repo/os/$arch -Server = https://mirror.mikrogravitation.org/archlinux/$repo/os/$arch -Server = http://nocix.mm.fcix.net/archlinux/$repo/os/$arch +Server = https://mirror.yal.sl-chat.ru/archlinux/$repo/os/$arch +Server = https://mirror.kumi.systems/archlinux/$repo/os/$arch +Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch +Server = https://mirror.hel.sl-chat.ru/archlinux/$repo/os/$arch +Server = https://mirror.sunred.org/archlinux/$repo/os/$arch Server = https://ftp.myrveln.se/pub/linux/archlinux/$repo/os/$arch -Server = https://quantum-mirror.hu/mirrors/pub/archlinux/$repo/os/$arch Server = https://pkg.adfinis.com/archlinux/$repo/os/$arch -Server = https://mirrors.n-ix.net/archlinux/$repo/os/$arch -Server = http://arch.jensgutermuth.de/$repo/os/$arch -Server = http://mirror.wdc1.us.leaseweb.net/archlinux/$repo/os/$arch -Server = http://archlinux.datagr.am/$repo/os/$arch -Server = http://forksystems.mm.fcix.net/archlinux/$repo/os/$arch Server = http://ftp.myrveln.se/pub/linux/archlinux/$repo/os/$arch -Server = https://mirror.wdc1.us.leaseweb.net/archlinux/$repo/os/$arch -Server = http://nova.quantum-mirror.hu/mirrors/pub/archlinux/$repo/os/$arch -Server = https://mirror.librelabucm.org/archlinux/$repo/os/$arch -Server = https://mirrors.nic.cz/archlinux/$repo/os/$arch -Server = http://mirrors.vectair.net/archlinux/$repo/os/$arch +Server = http://pkg.adfinis.com/archlinux/$repo/os/$arch +Server = http://mirror.cyberbits.eu/archlinux/$repo/os/$arch +Server = https://mirror.cyberbits.eu/archlinux/$repo/os/$arch +Server = https://mirrors.janbruckner.de/archlinux/$repo/os/$arch +Server = http://mirror.ubrco.de/archlinux/$repo/os/$arch +Server = https://mirror.theo546.fr/archlinux/$repo/os/$arch +Server = http://mirror.sunred.org/archlinux/$repo/os/$arch +Server = https://archlinux.mailtunnel.eu/$repo/os/$arch +Server = http://mirror.f4st.host/archlinux/$repo/os/$arch +Server = https://mirror.srv.fail/archlinux/$repo/os/$arch +Server = https://de.arch.mirror.kescher.at/$repo/os/$arch +Server = http://mirrors.janbruckner.de/archlinux/$repo/os/$arch +Server = https://mirror.f4st.host/archlinux/$repo/os/$arch +Server = http://mirror.theo546.fr/archlinux/$repo/os/$arch +Server = http://arch.phinau.de/$repo/os/$arch +Server = https://archlinux.thaller.ws/$repo/os/$arch Server = http://archlinux.mailtunnel.eu/$repo/os/$arch -Server = http://super.quantum-mirror.hu/mirrors/pub/archlinux/$repo/os/$arch -Server = http://mirror.surf/archlinux/$repo/os/$arch -Server = https://mirror.surf/archlinux/$repo/os/$arch -Server = https://archlinux.uk.mirror.allworldit.com/archlinux/$repo/os/$arch -Server = http://mirror.mikrogravitation.org/archlinux/$repo/os/$arch -Server = http://mirror.23m.com/archlinux/$repo/os/$arch -Server = http://gluttony.sin.cvut.cz/arch/$repo/os/$arch -Server = https://mirror.telepoint.bg/archlinux/$repo/os/$arch -Server = https://mirrors.melbourne.co.uk/archlinux/$repo/os/$arch -Server = http://volico.mm.fcix.net/archlinux/$repo/os/$arch -Server = http://mirror.spaceint.fr/archlinux/$repo/os/$arch -Server = http://mirror.lcarilla.de/archlinux/$repo/os/$arch -Server = http://mirror.math.princeton.edu/pub/archlinux/$repo/os/$arch -Server = https://nocix.mm.fcix.net/archlinux/$repo/os/$arch -Server = http://ftp.sh.cvut.cz/arch/$repo/os/$arch -Server = https://forksystems.mm.fcix.net/archlinux/$repo/os/$arch -Server = http://mirror.hackingand.coffee/arch/$repo/os/$arch -Server = http://mirror.librelabucm.org/archlinux/$repo/os/$arch -Server = http://mirror.quantum5.ca/archlinux/$repo/os/$arch -Server = http://in-mirror.garudalinux.org/archlinux/$repo/os/$arch -Server = http://mirrors.cat.pdx.edu/archlinux/$repo/os/$arch -Server = https://mirror.sahil.world/archlinux/$repo/os/$arch -Server = http://edgeuno-bog2.mm.fcix.net/archlinux/$repo/os/$arch -Server = http://mirror.fcix.net/archlinux/$repo/os/$arch -Server = http://ohioix.mm.fcix.net/archlinux/$repo/os/$arch -Server = http://ziply.mm.fcix.net/archlinux/$repo/os/$arch -Server = http://codingflyboy.mm.fcix.net/archlinux/$repo/os/$arch -Server = http://ridgewireless.mm.fcix.net/archlinux/$repo/os/$arch -Server = http://uvermont.mm.fcix.net/archlinux/$repo/os/$arch -Server = http://southfront.mm.fcix.net/archlinux/$repo/os/$arch -Server = http://mirror.ufscar.br/archlinux/$repo/os/$arch +Server = https://arch.phinau.de/$repo/os/$arch +Server = http://mirror.kumi.systems/archlinux/$repo/os/$arch +Server = http://mirror.moson.org/arch/$repo/os/$arch +Server = https://mirror.moson.org/arch/$repo/os/$arch +Server = rsync://mirror.yal.sl-chat.ru/archlinux/$repo/os/$arch +Server = http://archlinux.thaller.ws/$repo/os/$arch +Server = https://nox.panibrez.com/archlinux/$repo/os/$arch +Server = rsync://mirror.hel.sl-chat.ru/archlinux/$repo/os/$arch +Server = rsync://de.arch.mirror.kescher.at/mirror/arch/$repo/os/$arch +Server = http://arch.sakamoto.pl/$repo/os/$arch +Server = https://arch.sakamoto.pl/$repo/os/$arch +Server = rsync://mirrors.janbruckner.de/archlinux/$repo/os/$arch +Server = rsync://rsync.cyberbits.eu/archlinux/$repo/os/$arch +Server = rsync://mirror.ubrco.de/archlinux/$repo/os/$arch +Server = rsync://sync.mirror.sunred.org/archlinux/$repo/os/$arch +Server = rsync://rsync.myrveln.se/pub/linux/archlinux/$repo/os/$arch +Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch +Server = rsync://archlinux.mailtunnel.eu/archlinux/$repo/os/$arch +Server = rsync://mirror.f4st.host/archlinux/$repo/os/$arch +Server = rsync://mirror.moson.org/arch/$repo/os/$arch +Server = rsync://rsync.eloteam.tk/archlinux/$repo/os/$arch +Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch +Server = rsync://mirror.kumi.systems/archlinux/$repo/os/$arch +Server = rsync://arch.mirror.far.fi/archlinux/$repo/os/$arch diff --git a/airootfs/etc/reflector-simple.conf b/airootfs/etc/reflector-simple.conf index 8468732..25fcc65 100644 --- a/airootfs/etc/reflector-simple.conf +++ b/airootfs/etc/reflector-simple.conf @@ -1,6 +1,41 @@ --c CA,FI,FR,DE,IS,IE,IT,JP,KZ,LV,LU,NZ,NO,PL,PT,RU,SG,ES,SE,CH,TW,TH +### Default 'reflector options' for reflector-simple. +# +# +# Below you'll find the *default* values +# used by reflector-simple. The values below are shown as +# commented out since they are the defaults. +# These are simply options of the reflector app. +# Use command 'reflector --help' for more info about the options. +# +# Note: +# if your detected location (country) has Arch mirror(s), +# then (by default) it will be selected in reflector-simple. +# +# If your country has no Arch mirrors, then you must give +# one or more countries here or select in reflector-simple. +# +# Regardless of the above, you may give any selection +# of countries here. + +############# Now the default values: ############### + +## Which protocols should be supported (https preferred): --protocol https,http,rsync ---fastest 50 + +## Max number of most recently synchronized mirrors you want in the list: --latest 50 + +## How to sort the ranked mirrorlist +## (e.g. 'rate' for speed, 'age' for newest packages): +--fastest 50 --sort rate + +## Choose countries. By default your local country will likely be detected. +## To see supported countries, use command 'reflector --list-countries'. +## Examples (note the different syntaxes): +## --country Brazil,Finland,Germany,Netherlands +## -cBR,FI,DE,NL +## --country CA,"United States" +-c CA,FI,FR,DE,IS,IE,IT,JP,KZ,LV,LU,NZ,NO,PL,PT,RU,SG,ES,SE,CH,TW,TH, + --save /etc/pacman.d/mirrorlist diff --git a/airootfs/etc/xdg/reflector/reflector.conf b/airootfs/etc/xdg/reflector/reflector.conf index 7c830d2..124db17 100644 --- a/airootfs/etc/xdg/reflector/reflector.conf +++ b/airootfs/etc/xdg/reflector/reflector.conf @@ -1,8 +1,32 @@ # Reflector configuration file for the systemd service. +# +# Empty lines and lines beginning with "#" are ignored. All other lines should +# contain valid reflector command-line arguments. The lines are parsed with +# Python's shlex modules so standard shell syntax should work. All arguments are +# collected into a single argument list. +# +# See "reflector --help" for details. +# Recommended Options + +# Set the output path where the mirrorlist will be saved (--save). --save /etc/pacman.d/mirrorlist + +# Select the transfer protocol (--protocol). +--protocol https,http,rsync + --ipv4 --ipv6 ---protocol https + +# Select the country (--country). +# Consult the list of available countries with "reflector --list-countries" and +# select the countries nearest to you or the ones that you trust. For example: +# --country France,Germany +-c CA,FI,FR,DE,IS,IE,IT,JP,KZ,LV,LU,NZ,NO,PL,PT,RU,SG,ES,SE,CH,TW,TH, + +# Use only the most recently synchronized mirrors (--latest). --latest 20 + +# Sort the mirrors by synchronization time (--sort). +--fastest 50 --sort rate diff --git a/airootfs/root/customize_airootfs.sh b/airootfs/root/customize_airootfs.sh index e1b05d5..aa7e576 100755 --- a/airootfs/root/customize_airootfs.sh +++ b/airootfs/root/customize_airootfs.sh @@ -23,9 +23,6 @@ chown -R 1000:1000 /home/liveuser tar -xJvf /root/archives/skel.tar.xz -C /root --strip=1 --overwrite chown -R 0:0 /root -sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist -sed -i 's/#\(Storage=\)auto/\1volatile/' /etc/systemd/journald.conf +# echo -e "[Daemon]\nTheme=melawy-lera-sugar\nDeviceScale=1\nDeviceTimeout=8\nShowDelay=0" > "/usr/share/plymouth/plymouthd.defaults" -echo -e "[Daemon]\nTheme=melawy-lera-sugar\nDeviceScale=1\nDeviceTimeout=8\nShowDelay=0" > "/usr/share/plymouth/plymouthd.defaults" - -exit 0 +true diff --git a/airootfs/usr/share/wallpapers/melawy-linux/fenek.png b/airootfs/usr/share/wallpapers/melawy-linux/fenek.png deleted file mode 100644 index d501b9d..0000000 Binary files a/airootfs/usr/share/wallpapers/melawy-linux/fenek.png and /dev/null differ diff --git a/airootfs/usr/share/wallpapers/melawy-linux/lera-sugar.png b/airootfs/usr/share/wallpapers/melawy-linux/lera-sugar.png deleted file mode 100644 index fafb0de..0000000 Binary files a/airootfs/usr/share/wallpapers/melawy-linux/lera-sugar.png and /dev/null differ diff --git a/airootfs/usr/share/wallpapers/melawy-linux/nier-a2.png b/airootfs/usr/share/wallpapers/melawy-linux/nier-a2.png deleted file mode 100644 index 6ed5499..0000000 Binary files a/airootfs/usr/share/wallpapers/melawy-linux/nier-a2.png and /dev/null differ diff --git a/airootfs/usr/share/wallpapers/melawy-linux/splash.png b/airootfs/usr/share/wallpapers/melawy-linux/splash.png deleted file mode 100644 index 6ed5499..0000000 Binary files a/airootfs/usr/share/wallpapers/melawy-linux/splash.png and /dev/null differ diff --git a/generate_packages.x86_64_from_netinstall.py b/generate_packages.x86_64_from_netinstall.py index 3caf826..a576128 100755 --- a/generate_packages.x86_64_from_netinstall.py +++ b/generate_packages.x86_64_from_netinstall.py @@ -178,7 +178,7 @@ clonezilla ddrescue gpart grsync -melawy-calamares-qt6 +melawy-calamares-qt5 memtest86+ mkinitcpio-archiso mkinitcpio-nfs-utils diff --git a/netinstall.yaml b/netinstall.yaml index 4e580ec..0cbcc31 100644 --- a/netinstall.yaml +++ b/netinstall.yaml @@ -23,6 +23,7 @@ - linux-xanmod-anbox - linux-xanmod-anbox-headers - melawy-branding + - melawy-check-reboot-required - melawy-dracut-initramfs - melawy-dracut-ukify - melawy-etc-skel-std-powerman-kvantum @@ -423,6 +424,7 @@ - pkgfile - rebuild-detector - reflector + - reflector-simple - snapd - snapd-glib - yay @@ -447,10 +449,8 @@ - gnome-keyring - gnome-firmware - gparted - - gst-libav + - gstreamer-meta - gst-plugin-pipewire - - gst-plugins-bad - - gst-plugins-ugly - gwenview - karchive5 - kate diff --git a/packages.x86_64 b/packages.x86_64 index 1184d8d..da6b587 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -19,6 +19,7 @@ linux-firmware-marvell linux-xanmod-anbox linux-xanmod-anbox-headers melawy-branding +melawy-check-reboot-required melawy-dracut-initramfs melawy-dracut-ukify melawy-etc-skel-std-powerman-kvantum @@ -293,6 +294,7 @@ paru pkgfile rebuild-detector reflector +reflector-simple snapd snapd-glib yay @@ -314,10 +316,8 @@ glfw-wayland gnome-firmware gnome-keyring gparted -gst-libav gst-plugin-pipewire -gst-plugins-bad -gst-plugins-ugly +gstreamer-meta gwenview karchive5 kate @@ -604,7 +604,7 @@ clonezilla ddrescue gpart grsync -melawy-calamares-qt6 +melawy-calamares-qt5 memtest86+ mkinitcpio-archiso mkinitcpio-nfs-utils diff --git a/pacman_sys.conf b/pacman_sys.conf index 4649795..7c4512b 100644 --- a/pacman_sys.conf +++ b/pacman_sys.conf @@ -1,14 +1,14 @@ -# +# # /etc/pacman.conf -# -# +# +# # See the pacman.conf(5) manpage for option and repository directives -# +# # SPDX-License-Identifier: GPL-3.0-or-later -# +# # GENERAL OPTIONS -# +# [options] # The following paths are commented out with their default values listed. # If you wish to use different paths, uncomment and update the paths. @@ -145,19 +145,19 @@ Include = /etc/pacman.d/chaotic-mirrorlist # SigLevel = Optional TrustAll # Server = https://xerolinux.github.io/$repo/$arch -[xerolinux_repo] -SigLevel = Optional TrustAll -Include = /etc/pacman.d/xero-mirrorlist - -[xerolinux_repo_xl] -SigLevel = Optional TrustAll -Include = /etc/pacman.d/xero-mirrorlist - -[cachyos] -Include = /etc/pacman.d/cachyos-mirrorlist - -[endeavouros] -Include = /etc/pacman.d/endeavouros-mirrorlist +# [xerolinux_repo] +# SigLevel = Optional TrustAll +# Include = /etc/pacman.d/xero-mirrorlist +# +# [xerolinux_repo_xl] +# SigLevel = Optional TrustAll +# Include = /etc/pacman.d/xero-mirrorlist +# +# [cachyos] +# Include = /etc/pacman.d/cachyos-mirrorlist +# +# [endeavouros] +# Include = /etc/pacman.d/endeavouros-mirrorlist # [melawy-aur] # Include = /etc/pacman.d/melawy-linux-mirrorlist diff --git a/profiledef.sh b/profiledef.sh index 5a6db69..9289969 100644 --- a/profiledef.sh +++ b/profiledef.sh @@ -14,7 +14,7 @@ out_dir="../boot/iso" bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito') arch="x86_64" -pacman_conf="/etc/pacman.conf" +pacman_conf="pacman_sys.conf" airootfs_image_type="squashfs" airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M') file_permissions=(