Merge branch 'dev' of github.com:FascodeNet/alterlinux into dev

Author: Hayao0819

build.sh

@@ -370,6 +370,12 @@ prepare_build() {
     modules=("${_modules[@]}")
     unset _modules
 
+    # Ignore modules
+    local _m
+    for _m in "${exclude_modules[@]}"; do
+        readarray -t modules < <(printf "%s\n" "${modules[@]}" | grep -xv "${_m}")
+    done
+
     # Check modules
     module_check(){
         msg_debug -n "Checking ${1} module ... "

channels/releng/airootfs.any/root/customize_airootfs.sh

@@ -81,6 +81,10 @@ cp -aT /etc/skel/ /root/
 sed -i 's/#\(PermitRootLogin \).\+/\1yes/' /etc/ssh/sshd_config
 sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist
 
+if [[ -e "/root/.automated_script.sh" ]]; then
+    chmod 755 "/root/.automated_script.sh"
+fi
+
 # Enable services.
 systemctl enable NetworkManager
 systemctl enable pacman-init.service

channels/releng/alteriso

@@ -1 +1 @@
-alteriso=3.0
+alteriso=3.1

channels/releng/config.any

@@ -76,23 +76,12 @@ nochname=true
 # List of packages required for build
 # The following packages are checked to see if they are installed before running build.sh
 # Also, wizard.sh will install it automatically.
-dependence=(
-#   "alterlinux-keyring"
-#   "archiso"
-    "arch-install-scripts"
-    "curl"
-    "dosfstools"
-    "edk2-shell"
-    "git"
-    "libburn"
-    "libisofs"
-    "lz4"
-    "lzo"
-    "make"
-    "squashfs-tools"
-    "libisoburn"
- #  "lynx"
-    "xz"
-    "zlib"
-    "zstd"
+readarray -t dependence < <(printf "%s\n" "${dependence[@]}" | grep -xv "alterlinux-keyring")
+
+# Modules to include
+# An array of module directory names to include.
+# This setting cannot be changed by an argument.
+modules=(
+    base
+    share
 )

default.conf

@@ -306,6 +306,10 @@ additional_exclude_pkg=()
 # This array is not available in the configuration files in the channel.
 additional_modules=()
 
+
+# Module list 
+exclude_modules=()
+
 # Run with tee command
 # Set to "false" to disable logging
 # If not false, the log will be saved in the specified path.