Update
This commit is contained in:
Valeria Fadeeva
parent
bd2d72d35f
commit
7cd5f83d56
|
|
@ -145,8 +145,8 @@ DBGSRCDIR="/usr/src/debug"
|
|||
#
|
||||
COMPRESSGZ=(gzip -c -f -n)
|
||||
COMPRESSBZ2=(bzip2 -c -f)
|
||||
COMPRESSXZ=(xz -v -c -z --threads=0 -9 -e -)
|
||||
COMPRESSZST=(zstd -c -z -q -)
|
||||
COMPRESSXZ=(xz -v -c -z - --threads=0 -9 -e)
|
||||
COMPRESSZST=(zstd -v -c -z - --threads=0)
|
||||
COMPRESSLRZ=(lrzip -q)
|
||||
COMPRESSLZO=(lzop -q)
|
||||
COMPRESSZ=(compress -c -f)
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
LSB_VERSION=2.0
|
||||
DISTRIB_ID="MelawyLinux"
|
||||
DISTRIB_RELEASE="rolling"
|
||||
DISTRIB_DESCRIPTION="Melawy Linux"
|
||||
|
|
@ -0,0 +1,99 @@
|
|||
# /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]
|
||||
# RootDir = /
|
||||
# DBPath = /var/lib/pacman/
|
||||
# CacheDir = /var/cache/pacman/pkg/
|
||||
# LogFile = /var/log/pacman.log
|
||||
# GPGDir = /etc/pacman.d/gnupg/
|
||||
# HookDir = /etc/pacman.d/hooks/
|
||||
HoldPkg = base base-devel pacman glibc
|
||||
# XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||
# XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||
# CleanMethod = KeepInstalled
|
||||
Architecture = auto
|
||||
#IgnorePkg =
|
||||
# IgnoreGroup =
|
||||
# NoUpgrade =
|
||||
# NoExtract =
|
||||
# UseSyslog
|
||||
Color
|
||||
ILoveCandy
|
||||
# NoProgressBar
|
||||
CheckSpace
|
||||
VerbosePkgLists
|
||||
ParallelDownloads = 8
|
||||
SigLevel = Required DatabaseOptional
|
||||
LocalFileSigLevel = Optional
|
||||
# RemoteFileSigLevel = Required
|
||||
|
||||
#[core]
|
||||
#SigLevel = Never
|
||||
#Include = /etc/pacman.d/kaos-mirrorlist
|
||||
|
||||
#[main]
|
||||
#SigLevel = Never
|
||||
#Include = /etc/pacman.d/kaos-mirrorlist
|
||||
|
||||
#[apps]
|
||||
#SigLevel = Never
|
||||
#Include = /etc/pacman.d/kaos-mirrorlist
|
||||
|
||||
|
||||
#[kde-unstable]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[melawy]
|
||||
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
|
||||
|
||||
[core]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# [extra-testing]
|
||||
# Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[extra]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# [multilib-testing]
|
||||
# Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[multilib]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[arcolinux_repo]
|
||||
Include = /etc/pacman.d/arcolinux-mirrorlist
|
||||
|
||||
[arcolinux_repo_xlarge]
|
||||
Include = /etc/pacman.d/arcolinux-mirrorlist
|
||||
|
||||
[arcolinux_repo_3party]
|
||||
Include = /etc/pacman.d/arcolinux-mirrorlist
|
||||
|
||||
[garuda]
|
||||
Include = /etc/pacman.d/chaotic-mirrorlist
|
||||
|
||||
[chaotic-aur]
|
||||
Include = /etc/pacman.d/chaotic-mirrorlist
|
||||
|
||||
# [custom]
|
||||
# SigLevel = Optional TrustAll
|
||||
# Server = file:///home/custompkgs
|
||||
|
|
@ -0,0 +1,99 @@
|
|||
# /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]
|
||||
# RootDir = /
|
||||
# DBPath = /var/lib/pacman/
|
||||
# CacheDir = /var/cache/pacman/pkg/
|
||||
# LogFile = /var/log/pacman.log
|
||||
# GPGDir = /etc/pacman.d/gnupg/
|
||||
# HookDir = /etc/pacman.d/hooks/
|
||||
HoldPkg = base base-devel pacman glibc
|
||||
# XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||
# XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||
# CleanMethod = KeepInstalled
|
||||
Architecture = auto
|
||||
#IgnorePkg =
|
||||
# IgnoreGroup =
|
||||
# NoUpgrade =
|
||||
# NoExtract =
|
||||
# UseSyslog
|
||||
Color
|
||||
ILoveCandy
|
||||
# NoProgressBar
|
||||
CheckSpace
|
||||
VerbosePkgLists
|
||||
ParallelDownloads = 8
|
||||
SigLevel = Required DatabaseOptional
|
||||
LocalFileSigLevel = Optional
|
||||
# RemoteFileSigLevel = Required
|
||||
|
||||
#[core]
|
||||
#SigLevel = Never
|
||||
#Include = /etc/pacman.d/kaos-mirrorlist
|
||||
|
||||
#[main]
|
||||
#SigLevel = Never
|
||||
#Include = /etc/pacman.d/kaos-mirrorlist
|
||||
|
||||
#[apps]
|
||||
#SigLevel = Never
|
||||
#Include = /etc/pacman.d/kaos-mirrorlist
|
||||
|
||||
|
||||
#[kde-unstable]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[melawy]
|
||||
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
|
||||
|
||||
[core]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# [extra-testing]
|
||||
# Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[extra]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# [multilib-testing]
|
||||
# Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[multilib]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[arcolinux_repo]
|
||||
Include = /etc/pacman.d/arcolinux-mirrorlist
|
||||
|
||||
[arcolinux_repo_xlarge]
|
||||
Include = /etc/pacman.d/arcolinux-mirrorlist
|
||||
|
||||
[arcolinux_repo_3party]
|
||||
Include = /etc/pacman.d/arcolinux-mirrorlist
|
||||
|
||||
[garuda]
|
||||
Include = /etc/pacman.d/chaotic-mirrorlist
|
||||
|
||||
[chaotic-aur]
|
||||
Include = /etc/pacman.d/chaotic-mirrorlist
|
||||
|
||||
# [custom]
|
||||
# SigLevel = Optional TrustAll
|
||||
# Server = file:///home/custompkgs
|
||||
|
|
@ -57,9 +57,9 @@ 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
|
||||
# [cache]
|
||||
# SigLevel = Optional
|
||||
# Server = http://192.168.1.250/$repo/$arch
|
||||
|
||||
# [core-testing]
|
||||
# Include = /etc/pacman.d/mirrorlist
|
||||
|
|
|
|||
|
|
@ -1,116 +0,0 @@
|
|||
# $OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $
|
||||
|
||||
# This is the sshd server system-wide configuration file. See
|
||||
# sshd_config(5) for more information.
|
||||
|
||||
# This sshd was compiled with PATH=/usr/local/sbin:/usr/local/bin:/usr/bin
|
||||
|
||||
# The strategy used for options in the default sshd_config shipped with
|
||||
# OpenSSH is to specify options with their default value where
|
||||
# possible, but leave them commented. Uncommented options override the
|
||||
# default value.
|
||||
|
||||
#Port 22
|
||||
#AddressFamily any
|
||||
#ListenAddress 0.0.0.0
|
||||
#ListenAddress ::
|
||||
|
||||
#HostKey /etc/ssh/ssh_host_rsa_key
|
||||
#HostKey /etc/ssh/ssh_host_ecdsa_key
|
||||
#HostKey /etc/ssh/ssh_host_ed25519_key
|
||||
|
||||
# Ciphers and keying
|
||||
#RekeyLimit default none
|
||||
|
||||
# Logging
|
||||
#SyslogFacility AUTH
|
||||
#LogLevel INFO
|
||||
|
||||
# Authentication:
|
||||
|
||||
#LoginGraceTime 2m
|
||||
PermitRootLogin yes
|
||||
#StrictModes yes
|
||||
#MaxAuthTries 6
|
||||
#MaxSessions 10
|
||||
|
||||
#PubkeyAuthentication yes
|
||||
|
||||
# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
|
||||
# but this is overridden so installations will only check .ssh/authorized_keys
|
||||
AuthorizedKeysFile .ssh/authorized_keys
|
||||
|
||||
#AuthorizedPrincipalsFile none
|
||||
|
||||
#AuthorizedKeysCommand none
|
||||
#AuthorizedKeysCommandUser nobody
|
||||
|
||||
# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
|
||||
#HostbasedAuthentication no
|
||||
# Change to yes if you don't trust ~/.ssh/known_hosts for
|
||||
# HostbasedAuthentication
|
||||
#IgnoreUserKnownHosts no
|
||||
# Don't read the user's ~/.rhosts and ~/.shosts files
|
||||
#IgnoreRhosts yes
|
||||
|
||||
# To disable tunneled clear text passwords, change to no here!
|
||||
#PasswordAuthentication yes
|
||||
#PermitEmptyPasswords no
|
||||
|
||||
# Change to no to disable s/key passwords
|
||||
KbdInteractiveAuthentication no
|
||||
|
||||
# Kerberos options
|
||||
#KerberosAuthentication no
|
||||
#KerberosOrLocalPasswd yes
|
||||
#KerberosTicketCleanup yes
|
||||
#KerberosGetAFSToken no
|
||||
|
||||
# GSSAPI options
|
||||
#GSSAPIAuthentication no
|
||||
#GSSAPICleanupCredentials yes
|
||||
|
||||
# Set this to 'yes' to enable PAM authentication, account processing,
|
||||
# and session processing. If this is enabled, PAM authentication will
|
||||
# be allowed through the KbdInteractiveAuthentication and
|
||||
# PasswordAuthentication. Depending on your PAM configuration,
|
||||
# PAM authentication via KbdInteractiveAuthentication may bypass
|
||||
# the setting of "PermitRootLogin prohibit-password".
|
||||
# If you just want the PAM account and session checks to run without
|
||||
# PAM authentication, then enable this but set PasswordAuthentication
|
||||
# and KbdInteractiveAuthentication to 'no'.
|
||||
UsePAM yes
|
||||
|
||||
#AllowAgentForwarding yes
|
||||
#AllowTcpForwarding yes
|
||||
#GatewayPorts no
|
||||
#X11Forwarding no
|
||||
#X11DisplayOffset 10
|
||||
#X11UseLocalhost yes
|
||||
#PermitTTY yes
|
||||
PrintMotd no
|
||||
#PrintLastLog yes
|
||||
#TCPKeepAlive yes
|
||||
#PermitUserEnvironment no
|
||||
#Compression delayed
|
||||
#ClientAliveInterval 0
|
||||
#ClientAliveCountMax 3
|
||||
#UseDNS no
|
||||
#PidFile /run/sshd.pid
|
||||
#MaxStartups 10:30:100
|
||||
#PermitTunnel no
|
||||
#ChrootDirectory none
|
||||
#VersionAddendum none
|
||||
|
||||
# no default banner path
|
||||
#Banner none
|
||||
|
||||
# override default of no subsystems
|
||||
Subsystem sftp /usr/lib/ssh/sftp-server
|
||||
|
||||
# Example of overriding settings on a per-user basis
|
||||
#Match User anoncvs
|
||||
# X11Forwarding no
|
||||
# AllowTcpForwarding no
|
||||
# PermitTTY no
|
||||
# ForceCommand cvs server
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# Allow root login using password authentication
|
||||
PasswordAuthentication yes
|
||||
PermitRootLogin yes
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -23,8 +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
|
||||
|
||||
cp -fT /etc/melawy-linux-release /etc/lsb-release
|
||||
|
||||
sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist
|
||||
sed -i 's/#\(Storage=\)auto/\1volatile/' /etc/systemd/journald.conf
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,14 @@
|
|||
#!/bin/bash
|
||||
|
||||
Main() {
|
||||
resp=$(curl -s -o /dev/null -I -w "%{http_code}" http://192.168.1.250/cache/x86_64/)
|
||||
|
||||
if [ $resp -eq 200 ]; then
|
||||
sudo cp /etc/pacman-cache.conf /etc/pacman.conf
|
||||
else
|
||||
sudo cp /etc/pacman-std.conf /etc/pacman.conf
|
||||
fi
|
||||
|
||||
local mode=offline
|
||||
local progname=""
|
||||
progname="$(basename "$0")"
|
||||
|
|
|
|||
|
|
@ -26,6 +26,14 @@ catch_chrooted_pacman_log() {
|
|||
}
|
||||
|
||||
Main() {
|
||||
resp=$(curl -s -o /dev/null -I -w "%{http_code}" http://192.168.1.250/cache/x86_64/)
|
||||
|
||||
if [ $resp -eq 200 ]; then
|
||||
sudo cp /etc/pacman-cache.conf /etc/pacman.conf
|
||||
else
|
||||
sudo cp /etc/pacman-std.conf /etc/pacman.conf
|
||||
fi
|
||||
|
||||
local progname
|
||||
progname="$(basename "$0")"
|
||||
local log=/home/liveuser/melawy-install.log
|
||||
|
|
|
|||
|
|
@ -5,9 +5,6 @@
|
|||
selected: true
|
||||
critical: true
|
||||
packages:
|
||||
- pacman
|
||||
- pacman-mirrorlist
|
||||
- pacman-contrib
|
||||
- archlinux-keyring
|
||||
- arcolinux-keyring
|
||||
- arcolinux-mirrorlist-git
|
||||
|
|
@ -20,6 +17,7 @@
|
|||
- chwd-db
|
||||
- dracut
|
||||
- gptfdisk
|
||||
- iptables-nft
|
||||
- linux-firmware
|
||||
- linux-firmware-marvell
|
||||
- linux-xanmod-anbox
|
||||
|
|
@ -32,6 +30,9 @@
|
|||
- melawy-linux-mirrorlist
|
||||
- melawy-refind-menu-generator
|
||||
- melawy-welcome
|
||||
- pacman
|
||||
- pacman-contrib
|
||||
- pacman-mirrorlist
|
||||
- plymouth
|
||||
- plymouth-kcm
|
||||
- refind
|
||||
|
|
@ -42,7 +43,6 @@
|
|||
- xf86-input-void
|
||||
- xf86-video-fbdev
|
||||
- xf86-video-openchrome
|
||||
- iptables-nft
|
||||
|
||||
- name: "Virtual machines"
|
||||
description: "Required if OS run in virtual environment"
|
||||
|
|
@ -52,6 +52,7 @@
|
|||
critical: true
|
||||
packages:
|
||||
- bridge-utils
|
||||
- edk2-shell
|
||||
- hyperv
|
||||
- libvirt
|
||||
- open-vm-tools
|
||||
|
|
@ -64,7 +65,6 @@
|
|||
- xf86-input-vmmouse
|
||||
- xf86-video-qxl
|
||||
- xf86-video-vmware
|
||||
- edk2-shell
|
||||
|
||||
- name: "Booting process: Refind integration"
|
||||
description: "Boot loader screen"
|
||||
|
|
@ -256,12 +256,12 @@
|
|||
- nvidia-340xx-settings
|
||||
- nvidia-340xx-utils
|
||||
|
||||
- name: "ZFS drivers"
|
||||
description: "ZFS filesystem drivers"
|
||||
selected: true
|
||||
packages:
|
||||
- zfs-dkms-git
|
||||
- zfs-utils-git
|
||||
# - name: "ZFS drivers"
|
||||
# description: "ZFS filesystem drivers"
|
||||
# selected: true
|
||||
# packages:
|
||||
# - zfs-dkms-git
|
||||
# - zfs-utils-git
|
||||
|
||||
- name: "V4L2 drivers"
|
||||
description: "V4L2 video, webcamera drivers"
|
||||
|
|
@ -327,6 +327,7 @@
|
|||
- rsync
|
||||
- s-nail
|
||||
- screen
|
||||
- screenfetch
|
||||
- sed
|
||||
- sudo
|
||||
- sysfsutils
|
||||
|
|
@ -410,7 +411,11 @@
|
|||
- ocs-url
|
||||
- octopi
|
||||
- pace
|
||||
- pamac-all
|
||||
- pamac-cli
|
||||
- pamac-gtk
|
||||
- libpamac
|
||||
- libpamac-flatpak-plugin
|
||||
- libpamac-snap-plugin
|
||||
- paru
|
||||
- pkgfile
|
||||
- rebuild-detector
|
||||
|
|
@ -434,6 +439,7 @@
|
|||
- ffmpegthumbnailer
|
||||
- ffmpegthumbs
|
||||
- file-roller
|
||||
- glfw-wayland
|
||||
- gnome-keyring
|
||||
- gparted
|
||||
- gst-libav
|
||||
|
|
@ -500,7 +506,6 @@
|
|||
- xdg-user-dirs-gtk
|
||||
- xdg-utils
|
||||
- xsettingsd
|
||||
- glfw-wayland
|
||||
|
||||
- name: "Filesystem"
|
||||
description: "Filesystem tools and applications"
|
||||
|
|
@ -755,14 +760,13 @@
|
|||
- boost
|
||||
- boost-libs
|
||||
- ccache
|
||||
- cmake
|
||||
- extra-cmake-modules
|
||||
- doxygen
|
||||
- codelldb
|
||||
- clang
|
||||
- lld
|
||||
- cmake
|
||||
- codelldb
|
||||
- dbeaver
|
||||
- doxygen
|
||||
- eslint-language-server
|
||||
- extra-cmake-modules
|
||||
- fakeroot
|
||||
- gcc
|
||||
- gcc-libs
|
||||
|
|
@ -773,6 +777,7 @@
|
|||
- github-desktop
|
||||
- icu69-bin
|
||||
- jdk-openjdk
|
||||
- lld
|
||||
- lldb
|
||||
- llvm
|
||||
- llvm-libs
|
||||
|
|
|
|||
|
|
@ -149,10 +149,6 @@ nvidia-dkms
|
|||
nvidia-settings
|
||||
nvidia-utils
|
||||
|
||||
## ZFS drivers
|
||||
zfs-dkms-git
|
||||
zfs-utils-git
|
||||
|
||||
## V4L2 drivers
|
||||
v4l2loopback-dkms
|
||||
|
||||
|
|
@ -211,6 +207,7 @@ ripgrep
|
|||
rsync
|
||||
s-nail
|
||||
screen
|
||||
screenfetch
|
||||
sed
|
||||
sudo
|
||||
sysfsutils
|
||||
|
|
@ -282,10 +279,14 @@ discover
|
|||
downgrade
|
||||
flatpak
|
||||
flatpak-kcm
|
||||
libpamac
|
||||
libpamac-flatpak-plugin
|
||||
libpamac-snap-plugin
|
||||
ocs-url
|
||||
octopi
|
||||
pace
|
||||
pamac-all
|
||||
pamac-cli
|
||||
pamac-gtk
|
||||
paru
|
||||
pkgfile
|
||||
rebuild-detector
|
||||
|
|
|
|||
|
|
@ -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="airootfs/etc/pacman.conf"
|
||||
pacman_conf="/etc/pacman.conf"
|
||||
airootfs_image_type="squashfs"
|
||||
airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
|
||||
file_permissions=(
|
||||
|
|
|
|||
Loading…
Reference in New Issue