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-08 15:47:53 +05:00
parent 4a374820b1
commit 2891dc3e3d
19 changed files with 162 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Melawy-Linux-Full/airootfs/etc/dracut.conf.d/defaults.conf
View File

@ -1,3 +1,3 @@
omit_dracutmodules+=" network cifs nfs brltty " omit_dracutmodules+=" network cifs nfs brltty "
compress="xz" compress="zstd"
hostonly="no" hostonly="no"

10
Melawy-Linux-Full/airootfs/etc/mkinitcpio.conf
View File

@ -49,8 +49,8 @@ FILES=()
# #
## NOTE: If you have /usr on a separate partition, you MUST include the ## NOTE: If you have /usr on a separate partition, you MUST include the
# usr, fsck and shutdown hooks. # usr, fsck and shutdown hooks.
#HOOKS=(base udev modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard) HOOKS=(base udev modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard plymouth)
HOOKS=(base udev modconf kms sd-vconsole memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard plymouth) #HOOKS=(base udev modconf kms sd-vconsole memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard plymouth)
# COMPRESSION # COMPRESSION
# Use this to compress the initramfs image. By default, gzip compression # Use this to compress the initramfs image. By default, gzip compression
@ -58,11 +58,11 @@ HOOKS=(base udev modconf kms sd-vconsole memdisk archiso archiso_loop_mnt archis
#COMPRESSION="gzip" #COMPRESSION="gzip"
#COMPRESSION="bzip2" #COMPRESSION="bzip2"
#COMPRESSION="lzma" #COMPRESSION="lzma"
COMPRESSION="xz" #COMPRESSION="xz"
#COMPRESSION="lzop" #COMPRESSION="lzop"
#COMPRESSION="lz4" #COMPRESSION="lz4"
#COMPRESSION="zstd" COMPRESSION="zstd"
# COMPRESSION_OPTIONS # COMPRESSION_OPTIONS
# Additional options for the compressor # Additional options for the compressor
COMPRESSION_OPTIONS=(-9) #COMPRESSION_OPTIONS=(-9)

24
Melawy-Linux-Full/airootfs/etc/mkinitcpio.d/linux-hardened.preset
View File

@ -1,8 +1,24 @@
# mkinitcpio preset file for the 'linux' package on archiso # mkinitcpio preset file for the 'linux-hardened' package on archiso
KNAME="hardened"
KVER=$(ls /usr/lib/modules/ | grep $KNAME | sort -V | tail -n 1)
if [[ -z "$KVER" ]]; then
exit
fi
cp -vf "/usr/lib/modules/$KVER/vmlinuz" "/boot/vmlinuz-linux-hardened"
ALL_config="/etc/mkinitcpio.conf"
ALL_kver="/usr/lib/modules/$KVER/vmlinuz"
ALL_kver="/boot/vmlinuz-linux-hardened"
ALL_microcode=(/boot/*-ucode.img)
PRESETS=('archiso') PRESETS=('archiso')
ALL_kver='/boot/vmlinuz-linux-hardened' #archiso_config="/etc/mkinitcpio.conf"
ALL_config='/etc/mkinitcpio.conf'
archiso_image="/boot/initramfs-linux-hardened.img" archiso_image="/boot/initramfs-linux-hardened.img"
#archiso_uki="/efi/EFI/Linux/linux-hardened.efi"
archiso_uki="/boot/linux-hardened.efi"
archiso_options="--cmdline /proc/cmdline"

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

@ -3,28 +3,28 @@
################################################################################ ################################################################################
# With: reflector @/etc/xdg/reflector/reflector.conf # With: reflector @/etc/xdg/reflector/reflector.conf
# When: 2024-01-06 08:42:28 UTC # When: 2024-01-08 07:47:52 UTC
# From: https://archlinux.org/mirrors/status/json/ # From: https://archlinux.org/mirrors/status/json/
# Retrieved: 2024-01-06 08:41:50 UTC # Retrieved: 2024-01-08 07:47:24 UTC
# Last Check: 2024-01-06 08:16:26 UTC # Last Check: 2024-01-08 07:32:49 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 = https://mirror.f4st.host/archlinux/$repo/os/$arch
Server = http://mirror.f4st.host/archlinux/$repo/os/$arch Server = https://mirror.theo546.fr/archlinux/$repo/os/$arch
Server = https://archlinux.thaller.ws/$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 = http://mirror.cyberbits.eu/archlinux/$repo/os/$arch
Server = https://mirror.sunred.org/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 = https://mirror.cyberbits.eu/archlinux/$repo/os/$arch
Server = http://mirror.moson.org/arch/$repo/os/$arch Server = http://mirror.moson.org/arch/$repo/os/$arch
Server = https://mirror.moson.org/arch/$repo/os/$arch Server = https://archlinux.mailtunnel.eu/$repo/os/$arch
Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch Server = http://mirror.sunred.org/archlinux/$repo/os/$arch
Server = http://archlinux.thaller.ws/$repo/os/$arch Server = http://archlinux.thaller.ws/$repo/os/$arch
Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch Server = https://mirror.moson.org/arch/$repo/os/$arch
Server = rsync://archlinux.mailtunnel.eu/archlinux/$repo/os/$arch Server = rsync://archlinux.mailtunnel.eu/archlinux/$repo/os/$arch
Server = rsync://mirror.theo546.fr/archlinux/$repo/os/$arch
Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch
Server = rsync://rsync.cyberbits.eu/archlinux/$repo/os/$arch
Server = https://archmirror.it/repos/$repo/os/$arch
Server = rsync://sync.mirror.sunred.org/archlinux/$repo/os/$arch Server = rsync://sync.mirror.sunred.org/archlinux/$repo/os/$arch
Server = rsync://mirror.moson.org/arch/$repo/os/$arch Server = rsync://mirror.pseudoform.org/packages/$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

2
Melawy-Linux-Full/packages.x86_64
View File

@ -706,7 +706,7 @@ ddrescue
edk2-shell edk2-shell
gpart gpart
rsync rsync
melawy-calamares-qt6-3.3.1 melawy-calamares-qt6-3.3.1-stable
melawy-skel-liveuser melawy-skel-liveuser
memtest86+ memtest86+
memtest86+-efi memtest86+-efi

2
Melawy-Linux-Full/pacman_sys.conf
View File

@ -133,7 +133,7 @@ Include = /etc/pacman.d/mirrorlist
[cache] [cache]
SigLevel = Optional 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 = http://192.168.1.250/$repo/$arch
Server = https://repo.melawy.ru/$repo/$arch Server = https://repo.melawy.ru/$repo/$arch

2
Melawy-Linux-NetInstall/airootfs/etc/dracut.conf.d/defaults.conf
View File

@ -1,3 +1,3 @@
omit_dracutmodules+=" network cifs nfs brltty " omit_dracutmodules+=" network cifs nfs brltty "
compress="xz" compress="zstd"
hostonly="no" hostonly="no"

10
Melawy-Linux-NetInstall/airootfs/etc/mkinitcpio.conf
View File

@ -49,8 +49,8 @@ FILES=()
# #
## NOTE: If you have /usr on a separate partition, you MUST include the ## NOTE: If you have /usr on a separate partition, you MUST include the
# usr, fsck and shutdown hooks. # usr, fsck and shutdown hooks.
#HOOKS=(base udev modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard) HOOKS=(base udev modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard plymouth)
HOOKS=(base udev modconf kms sd-vconsole memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard plymouth) #HOOKS=(base udev modconf kms sd-vconsole memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard plymouth)
# COMPRESSION # COMPRESSION
# Use this to compress the initramfs image. By default, gzip compression # Use this to compress the initramfs image. By default, gzip compression
@ -58,11 +58,11 @@ HOOKS=(base udev modconf kms sd-vconsole memdisk archiso archiso_loop_mnt archis
#COMPRESSION="gzip" #COMPRESSION="gzip"
#COMPRESSION="bzip2" #COMPRESSION="bzip2"
#COMPRESSION="lzma" #COMPRESSION="lzma"
COMPRESSION="xz" #COMPRESSION="xz"
#COMPRESSION="lzop" #COMPRESSION="lzop"
#COMPRESSION="lz4" #COMPRESSION="lz4"
#COMPRESSION="zstd" COMPRESSION="zstd"
# COMPRESSION_OPTIONS # COMPRESSION_OPTIONS
# Additional options for the compressor # Additional options for the compressor
COMPRESSION_OPTIONS=(-9) #COMPRESSION_OPTIONS=(-9)

24
Melawy-Linux-NetInstall/airootfs/etc/mkinitcpio.d/linux-hardened.preset
View File

@ -1,8 +1,24 @@
# mkinitcpio preset file for the 'linux' package on archiso # mkinitcpio preset file for the 'linux-hardened' package on archiso
KNAME="hardened"
KVER=$(ls /usr/lib/modules/ | grep $KNAME | sort -V | tail -n 1)
if [[ -z "$KVER" ]]; then
exit
fi
cp -vf "/usr/lib/modules/$KVER/vmlinuz" "/boot/vmlinuz-linux-hardened"
ALL_config="/etc/mkinitcpio.conf"
ALL_kver="/usr/lib/modules/$KVER/vmlinuz"
ALL_kver="/boot/vmlinuz-linux-hardened"
ALL_microcode=(/boot/*-ucode.img)
PRESETS=('archiso') PRESETS=('archiso')
ALL_kver='/boot/vmlinuz-linux-hardened' #archiso_config="/etc/mkinitcpio.conf"
ALL_config='/etc/mkinitcpio.conf'
archiso_image="/boot/initramfs-linux-hardened.img" archiso_image="/boot/initramfs-linux-hardened.img"
#archiso_uki="/efi/EFI/Linux/linux-hardened.efi"
archiso_uki="/boot/linux-hardened.efi"
archiso_options="--cmdline /proc/cmdline"

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

@ -3,28 +3,28 @@
################################################################################ ################################################################################
# With: reflector @/etc/xdg/reflector/reflector.conf # With: reflector @/etc/xdg/reflector/reflector.conf
# When: 2024-01-06 08:42:28 UTC # When: 2024-01-07 12:54:57 UTC
# From: https://archlinux.org/mirrors/status/json/ # From: https://archlinux.org/mirrors/status/json/
# Retrieved: 2024-01-06 08:41:50 UTC # Retrieved: 2024-01-07 12:54:28 UTC
# Last Check: 2024-01-06 08:16:26 UTC # Last Check: 2024-01-07 12:50:15 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 = https://mirror.f4st.host/archlinux/$repo/os/$arch
Server = http://mirror.f4st.host/archlinux/$repo/os/$arch Server = http://mirror.sunred.org/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://mirror.sunred.org/archlinux/$repo/os/$arch
Server = https://archlinux.mailtunnel.eu/$repo/os/$arch Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch
Server = https://mirror.cyberbits.eu/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://archlinux.thaller.ws/$repo/os/$arch
Server = http://mirror.moson.org/arch/$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 = http://archlinux.thaller.ws/$repo/os/$arch
Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch Server = https://mirror.moson.org/arch/$repo/os/$arch
Server = rsync://archlinux.mailtunnel.eu/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://rsync.cyberbits.eu/archlinux/$repo/os/$arch
Server = rsync://mirror.moson.org/arch/$repo/os/$arch Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch
Server = http://arch.mirror.far.fi/$repo/os/$arch Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch
Server = rsync://arch.mirror.far.fi/archlinux/$repo/os/$arch Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch
Server = rsync://mirror.f4st.host/archlinux/$repo/os/$arch Server = rsync://mirror.f4st.host/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

2
Melawy-Linux-NetInstall/packages.x86_64
View File

@ -256,7 +256,7 @@ ddrescue
edk2-shell edk2-shell
gpart gpart
rsync rsync
melawy-calamares-qt6-3.3.1 melawy-calamares-qt6-3.3.1-stable
melawy-skel-liveuser melawy-skel-liveuser
memtest86+ memtest86+
memtest86+-efi memtest86+-efi

2
Melawy-Linux-NetInstall/pacman_sys.conf
View File

@ -133,7 +133,7 @@ Include = /etc/pacman.d/mirrorlist
[cache] [cache]
SigLevel = Optional 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 = http://192.168.1.250/$repo/$arch
Server = https://repo.melawy.ru/$repo/$arch Server = https://repo.melawy.ru/$repo/$arch

2
Melawy-Linux-Tiny/airootfs/etc/dracut.conf.d/defaults.conf
View File

@ -1,3 +1,3 @@
omit_dracutmodules+=" network cifs nfs brltty " omit_dracutmodules+=" network cifs nfs brltty "
compress="xz" compress="zstd"
hostonly="no" hostonly="no"

10
Melawy-Linux-Tiny/airootfs/etc/mkinitcpio.conf
View File

@ -49,8 +49,8 @@ FILES=()
# #
## NOTE: If you have /usr on a separate partition, you MUST include the ## NOTE: If you have /usr on a separate partition, you MUST include the
# usr, fsck and shutdown hooks. # usr, fsck and shutdown hooks.
#HOOKS=(base udev modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard) HOOKS=(base udev modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard plymouth)
HOOKS=(base udev modconf kms sd-vconsole memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard plymouth) #HOOKS=(base udev modconf kms sd-vconsole memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard plymouth)
# COMPRESSION # COMPRESSION
# Use this to compress the initramfs image. By default, gzip compression # Use this to compress the initramfs image. By default, gzip compression
@ -58,11 +58,11 @@ HOOKS=(base udev modconf kms sd-vconsole memdisk archiso archiso_loop_mnt archis
#COMPRESSION="gzip" #COMPRESSION="gzip"
#COMPRESSION="bzip2" #COMPRESSION="bzip2"
#COMPRESSION="lzma" #COMPRESSION="lzma"
COMPRESSION="xz" #COMPRESSION="xz"
#COMPRESSION="lzop" #COMPRESSION="lzop"
#COMPRESSION="lz4" #COMPRESSION="lz4"
#COMPRESSION="zstd" COMPRESSION="zstd"
# COMPRESSION_OPTIONS # COMPRESSION_OPTIONS
# Additional options for the compressor # Additional options for the compressor
COMPRESSION_OPTIONS=(-9) #COMPRESSION_OPTIONS=(-9)

24
Melawy-Linux-Tiny/airootfs/etc/mkinitcpio.d/linux-hardened.preset
View File

@ -1,8 +1,24 @@
# mkinitcpio preset file for the 'linux' package on archiso # mkinitcpio preset file for the 'linux-hardened' package on archiso
KNAME="hardened"
KVER=$(ls /usr/lib/modules/ | grep $KNAME | sort -V | tail -n 1)
if [[ -z "$KVER" ]]; then
exit
fi
cp -vf "/usr/lib/modules/$KVER/vmlinuz" "/boot/vmlinuz-linux-hardened"
ALL_config="/etc/mkinitcpio.conf"
ALL_kver="/usr/lib/modules/$KVER/vmlinuz"
ALL_kver="/boot/vmlinuz-linux-hardened"
ALL_microcode=(/boot/*-ucode.img)
PRESETS=('archiso') PRESETS=('archiso')
ALL_kver='/boot/vmlinuz-linux-hardened' #archiso_config="/etc/mkinitcpio.conf"
ALL_config='/etc/mkinitcpio.conf'
archiso_image="/boot/initramfs-linux-hardened.img" archiso_image="/boot/initramfs-linux-hardened.img"
#archiso_uki="/efi/EFI/Linux/linux-hardened.efi"
archiso_uki="/boot/linux-hardened.efi"
archiso_options="--cmdline /proc/cmdline"

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

@ -3,28 +3,28 @@
################################################################################ ################################################################################
# With: reflector @/etc/xdg/reflector/reflector.conf # With: reflector @/etc/xdg/reflector/reflector.conf
# When: 2024-01-06 08:42:28 UTC # When: 2024-01-07 12:54:57 UTC
# From: https://archlinux.org/mirrors/status/json/ # From: https://archlinux.org/mirrors/status/json/
# Retrieved: 2024-01-06 08:41:50 UTC # Retrieved: 2024-01-07 12:54:28 UTC
# Last Check: 2024-01-06 08:16:26 UTC # Last Check: 2024-01-07 12:50:15 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 = https://mirror.f4st.host/archlinux/$repo/os/$arch
Server = http://mirror.f4st.host/archlinux/$repo/os/$arch Server = http://mirror.sunred.org/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://mirror.sunred.org/archlinux/$repo/os/$arch
Server = https://archlinux.mailtunnel.eu/$repo/os/$arch Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch
Server = https://mirror.cyberbits.eu/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://archlinux.thaller.ws/$repo/os/$arch
Server = http://mirror.moson.org/arch/$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 = http://archlinux.thaller.ws/$repo/os/$arch
Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch Server = https://mirror.moson.org/arch/$repo/os/$arch
Server = rsync://archlinux.mailtunnel.eu/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://rsync.cyberbits.eu/archlinux/$repo/os/$arch
Server = rsync://mirror.moson.org/arch/$repo/os/$arch Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch
Server = http://arch.mirror.far.fi/$repo/os/$arch Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch
Server = rsync://arch.mirror.far.fi/archlinux/$repo/os/$arch Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch
Server = rsync://mirror.f4st.host/archlinux/$repo/os/$arch Server = rsync://mirror.f4st.host/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

2
Melawy-Linux-Tiny/packages.x86_64
View File

@ -538,7 +538,7 @@ ddrescue
edk2-shell edk2-shell
gpart gpart
rsync rsync
melawy-calamares-qt6-3.3.1 melawy-calamares-qt6-3.3.1-stable
melawy-skel-liveuser melawy-skel-liveuser
memtest86+ memtest86+
memtest86+-efi memtest86+-efi

2
Melawy-Linux-Tiny/pacman_sys.conf
View File

@ -133,7 +133,7 @@ Include = /etc/pacman.d/mirrorlist
[cache] [cache]
SigLevel = Optional 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 = http://192.168.1.250/$repo/$arch
Server = https://repo.melawy.ru/$repo/$arch Server = https://repo.melawy.ru/$repo/$arch

30
make.sh
View File

@ -17,6 +17,8 @@ fi
DELAY=1 DELAY=1
function check_internet() { function check_internet() {
SECONDS=0
ping -c 1 1.1.1.1 > /dev/null ping -c 1 1.1.1.1 > /dev/null
have_internet="$?" have_internet="$?"
@ -24,6 +26,9 @@ function check_internet() {
echo "No internet connection" echo "No internet connection"
exit exit
fi fi
ELAPSED="Elapsed: $(($SECONDS / 3600))hrs $((($SECONDS / 60) % 60))min $(($SECONDS % 60))sec"
echo -e "\n$ELAPSED\n"
} }
function clean() { function clean() {
@ -45,6 +50,8 @@ function clean() {
} }
function mirrorlist() { function mirrorlist() {
SECONDS=0
echo "MIRRORLIST" echo "MIRRORLIST"
check_internet check_internet
@ -52,9 +59,14 @@ function mirrorlist() {
sed -i -e "s/#Server/Server/g" /etc/pacman.d/mirrorlist.pacnew sed -i -e "s/#Server/Server/g" /etc/pacman.d/mirrorlist.pacnew
cp /etc/pacman.d/mirrorlist.pacnew /etc/pacman.d/mirrorlist cp /etc/pacman.d/mirrorlist.pacnew /etc/pacman.d/mirrorlist
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 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
ELAPSED="Elapsed: $(($SECONDS / 3600))hrs $((($SECONDS / 60) % 60))min $(($SECONDS % 60))sec"
echo -e "\n$ELAPSED\n"
} }
function prepare() { function prepare() {
SECONDS=0
echo "PREPARE" echo "PREPARE"
check_internet check_internet
@ -110,10 +122,15 @@ function prepare() {
cd "$CWD" cd "$CWD"
echo "PWD: $CWD" echo "PWD: $CWD"
ELAPSED="Elapsed: $(($SECONDS / 3600))hrs $((($SECONDS / 60) % 60))min $(($SECONDS % 60))sec"
echo -e "\n$ELAPSED\n"
} }
function build() { function build() {
SECONDS=0
echo "BUILD" echo "BUILD"
check_internet check_internet
@ -146,9 +163,14 @@ function build() {
cd "$CWD" cd "$CWD"
echo "PWD: $CWD" echo "PWD: $CWD"
ELAPSED="Elapsed: $(($SECONDS / 3600))hrs $((($SECONDS / 60) % 60))min $(($SECONDS % 60))sec"
echo -e "\n$ELAPSED\n"
} }
function sign() { function sign() {
SECONDS=0
cd "$CWD" cd "$CWD"
echo "PWD: $CWD" echo "PWD: $CWD"
@ -234,9 +256,13 @@ function sign() {
cd "$CWD" cd "$CWD"
echo "PWD: $CWD" echo "PWD: $CWD"
ELAPSED="Elapsed: $(($SECONDS / 3600))hrs $((($SECONDS / 60) % 60))min $(($SECONDS % 60))sec"
echo -e "\n$ELAPSED\n"
} }
function std_build() { function std_build() {
MAIN_SECONDS=0
# clean # clean
# sleep $DELAY # sleep $DELAY
# #
@ -251,6 +277,10 @@ function std_build() {
_notify _notify
sleep $DELAY sleep $DELAY
MAIN_ELAPSED="Elapsed: $(($MAIN_SECONDS / 3600))hrs $((($MAIN_SECONDS / 60) % 60))min $(($MAIN_SECONDS % 60))sec"
echo -e "\n$MAIN_ELAPSED\n"
exit exit
} }