diff --git a/00_reset_light.sh b/00_reset_light.sh index cf38c62..dbdded7 100755 --- a/00_reset_light.sh +++ b/00_reset_light.sh @@ -1,6 +1,6 @@ #!/bin/sh -sudo rm -rf ../work +sudo rm -rfv ../work mkdir ../work notify-send -a "$(basename $(pwd)): Reset" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" diff --git a/00_reset_with_packages.sh b/00_reset_with_packages.sh index d648b8b..974f157 100755 --- a/00_reset_with_packages.sh +++ b/00_reset_with_packages.sh @@ -1,8 +1,8 @@ #!/bin/sh -sudo rm -rf ../work -rm airootfs/opt/extra-drivers/*.pkg.tar.* -rm airootfs/root/packages/*.pkg.tar.* -rm airootfs/usr/share/packages/*.pkg.tar.* +sudo rm -rfv ../work +rm -v airootfs/opt/extra-drivers/*.pkg.tar.* +rm -v airootfs/root/packages/*.pkg.tar.* +rm -v airootfs/usr/share/packages/*.pkg.tar.* mkdir ../work notify-send -a "$(basename $(pwd)): Reset" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" diff --git a/01_prepare.sh b/01_prepare.sh index 202b247..b8d7f1a 100755 --- a/01_prepare.sh +++ b/01_prepare.sh @@ -33,6 +33,9 @@ do sudo pacman -Sw --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" + notify-send -a "$(basename $(pwd)): Prepare" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/03_make.sh b/03_make.sh index a93c87c..38eeda0 100755 --- a/03_make.sh +++ b/03_make.sh @@ -8,8 +8,8 @@ iso_name="Melawy-linux-${date_tag}-x86_64.iso" gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "../boot/txt/${iso_name}.sig" "../boot/iso/${iso_name}" sha1sum "../boot/iso/${iso_name}" > "../boot/txt/${iso_name}.sha1" sha256sum "../boot/iso/${iso_name}" > "../boot/txt/${iso_name}.sha256" -cp "../boot/iso/arch/pkglist.x86_64.txt" "../boot/txt/Melawy-linux-${date_tag}-pkglist.txt" +cp "../work/iso/arch/pkglist.x86_64.txt" "../boot/txt/Melawy-linux-${date_tag}-pkglist.txt" -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "Make finished" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/04_sign.sh b/04_sign.sh index c3654d9..86a9db0 100755 --- a/04_sign.sh +++ b/04_sign.sh @@ -1,12 +1,14 @@ #!/bin/bash + + date_tag=$(date +%Y.%m.%d) iso_name="Melawy-linux-${date_tag}-x86_64.iso" gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "../boot/txt/${iso_name}.sig" "../boot/iso/${iso_name}" sha1sum "../boot/iso/${iso_name}" > "../boot/txt/${iso_name}.sha1" sha256sum "../boot/iso/${iso_name}" > "../boot/txt/${iso_name}.sha256" -cp "../work/arch/pkglist.x86_64.txt" "../boot/txt/Melawy-linux-${date_tag}-pkglist.txt" +cp "../work/iso/arch/pkglist.x86_64.txt" "../boot/txt/Melawy-linux-${date_tag}-pkglist.txt" notify-send -a "$(basename $(pwd)): Sign" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" diff --git a/airootfs/etc/motd b/airootfs/etc/motd index 89bfb7d..16dedd7 100755 --- a/airootfs/etc/motd +++ b/airootfs/etc/motd @@ -15,30 +15,13 @@ Live environment will start now and let you install Melawy Linux to disk, or try Bugs can be reported here: https://github.com/Melawy -Getting help: https://github.com/Melawy -Chat is available on telegram: https://t.me/Melawy_chat -News is available on telegram: https://t.me/Melawy_news +Getting help: https://Melawy.ru +Chat on telegram: https://t.me/Melawy_chat +News on telegram: https://t.me/Melawy_news Our journey wouldn't be made possible without the donates: https://melawy.ru/donate - - - █▀▀▀▀▀█ ▀▀ █ ▄ █▀▀▀▀▀█ - █ ███ █ █▄ █▀██▄▄ █ ███ █ - █ ▀▀▀ █ ▀█▀▀▄▄█▀█ █ ▀▀▀ █ - ▀▀▀▀▀▀▀ ▀▄▀▄▀ █▄▀ ▀▀▀▀▀▀▀ - █▀█▀ ▄▀ █▄ ▄▀ ▄▀ ▄▀▀▀▄▀ - █▀ █ ▀▀█ ▄▄█▄▄ ▄ ▀█▄▄ - ███ █▀▀█▀▄█ ██▄ ██▄█ ▀▀█ - ▄▀ ▀█▀ █▀ █ ▀▄ ▀█▄█ ▀▀▄ - ▀▀▀▀▀▀█ ▀▀▄█ ██▀▀▀█▀█▀█ - █▀▀▀▀▀█ ▀ ▀█ ▄█ ▀ █ ▀█▀ - █ ███ █ ▄▀ ▀▄ █ ███▀██▄▄█ - █ ▀▀▀ █ █▀▄▀█▄ █ ▀▀ █ █▀ - ▀▀▀▀▀▀▀ ▀▀ ▀▀▀ ▀▀▀▀▀▀▀▀ - - Thank you for donating your trust in us! Welcome to your Melawy Linux diff --git a/airootfs/etc/pacman.conf b/airootfs/etc/pacman.conf index 67e10c5..89c154e 100644 --- a/airootfs/etc/pacman.conf +++ b/airootfs/etc/pacman.conf @@ -20,7 +20,7 @@ HoldPkg = base base-devel pacman glibc # XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u # CleanMethod = KeepInstalled Architecture = auto -# IgnorePkg = +#IgnorePkg = # IgnoreGroup = # NoUpgrade = # NoExtract = @@ -57,6 +57,10 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist [melawy-3party] Include = /etc/pacman.d/melawy-linux-mirrorlist +[cache] +SigLevel = Optional +Server = http://192.168.1.250/$repo/$arch + # [core-testing] # Include = /etc/pacman.d/mirrorlist diff --git a/airootfs/usr/local/bin/connection-checker b/airootfs/usr/local/bin/connection-checker new file mode 100755 index 0000000..f0185d5 --- /dev/null +++ b/airootfs/usr/local/bin/connection-checker @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +ping -c 1 1.1.1.1 > /dev/null +if [ $? -eq 0 ]; then + true +else + false +fi diff --git a/airootfs/usr/local/bin/update-mirrorlist b/airootfs/usr/local/bin/update-mirrorlist index de88131..85bc8c0 100755 --- a/airootfs/usr/local/bin/update-mirrorlist +++ b/airootfs/usr/local/bin/update-mirrorlist @@ -125,7 +125,7 @@ Main() { logterminal "version $VERSION" - /usr/bin/eos-connection-checker || { + /usr/local/bin/connection-checker || { logterminal "Internet connection is not available, cannot rank mirrorlist." return } diff --git a/netinstall.yaml b/netinstall.yaml index dd77cd1..7505bd9 100644 --- a/netinstall.yaml +++ b/netinstall.yaml @@ -28,7 +28,6 @@ - melawy-dracut-initramfs - melawy-dracut-ukify - melawy-etc-skel-std-powerman-kvantum - - melawy-hooks - melawy-linux-keyring - melawy-linux-mirrorlist - melawy-refind-menu-generator @@ -811,9 +810,9 @@ critical: false packages: - linux + - linux-headers - linux-hardened - linux-hardened-headers - - linux-headers - linux-lqx - linux-lqx-headers - linux-lts diff --git a/packages.x86_64 b/packages.x86_64 index ec8d12d..9454963 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -20,7 +20,6 @@ melawy-branding melawy-dracut-initramfs melawy-dracut-ukify melawy-etc-skel-std-powerman-kvantum -melawy-hooks melawy-linux-keyring melawy-linux-mirrorlist melawy-refind-menu-generator diff --git a/pacman.conf b/pacman.conf index 67e10c5..89c154e 100644 --- a/pacman.conf +++ b/pacman.conf @@ -20,7 +20,7 @@ HoldPkg = base base-devel pacman glibc # XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u # CleanMethod = KeepInstalled Architecture = auto -# IgnorePkg = +#IgnorePkg = # IgnoreGroup = # NoUpgrade = # NoExtract = @@ -57,6 +57,10 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist [melawy-3party] Include = /etc/pacman.d/melawy-linux-mirrorlist +[cache] +SigLevel = Optional +Server = http://192.168.1.250/$repo/$arch + # [core-testing] # Include = /etc/pacman.d/mirrorlist diff --git a/profiledef.sh b/profiledef.sh index 57ae115..9f629c8 100644 --- a/profiledef.sh +++ b/profiledef.sh @@ -26,19 +26,20 @@ file_permissions=( ["/root"]="0:0:750" ["/root/.automated_script"]="0:0:755" ["/usr/bin/GPU-Intel-installer"]="0:0:755" + ["/usr/local/bin/Installation_guide"]="0:0:755" ["/usr/local/bin/calamares-offline"]="0:0:755" ["/usr/local/bin/calamares-online"]="0:0:755" ["/usr/local/bin/choose-mirror"]="0:0:755" ["/usr/local/bin/chrooted-cleaner-script"]="0:0:755" ["/usr/local/bin/cleaner-script"]="0:0:755" + ["/usr/local/bin/connection-checker"]="0:0:755" ["/usr/local/bin/copy-refind-theme_v1"]="0:0:755" ["/usr/local/bin/copy-refind-theme_v2"]="0:0:755" ["/usr/local/bin/create-pacman-keyring"]="0:0:755" ["/usr/local/bin/dmcheck"]="0:0:755" ["/usr/local/bin/fix-keys"]="0:0:755" - ["/usr/local/bin/Installation_guide"]="0:0:755" ["/usr/local/bin/livecd-sound"]="0:0:755" - ["/usr/local/bin/online-install-drivers"]="0:0:755" + ["/usr/local/bin/online-install-nvidia-drivers"]="0:0:755" ["/usr/local/bin/prepare-live-desktop"]="0:0:755" ["/usr/local/bin/remove-ucode"]="0:0:755" ["/usr/local/bin/remove-unneeded"]="0:0:755"