Merge branch 'dev-stable'

Author: Hayao0819

airootfs/etc/lightdm/slick-greeter.conf

@@ -0,0 +1,7 @@
+[Greeter]
+background=/usr/share/backgrounds/alter.png
+draw-user-backgrounds=false
+draw-grid=false
+theme-name=Materia-dark-compact
+icon-theme-name=Paper
+other-monitors-logo=

airootfs/root/customize_airootfs.sh

@@ -21,12 +21,16 @@ while getopts 'p:bt:l' arg; do
 done
 
 
-
+# Enable and generate languages.
 sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen
 locale-gen
 
+
+# Setting the time zone.
 ln -sf /usr/share/zoneinfo/UTC /etc/localtime
 
+
+# Creating a root user.
 # usermod -s /usr/bin/zsh root
 usermod -s /bin/bash root
 cp -aT /etc/skel/ /root/
@@ -36,6 +40,7 @@ LANG=C xdg-user-dirs-update
 echo -e "${password}\n${password}" | passwd root
 
 
+# Create alter user.
 useradd -m -s /bin/bash alter
 groupadd sudo
 usermod -G sudo alter
@@ -45,20 +50,27 @@ chmod 700 -R /home/alter
 chown alter:alter -R /home/alter
 echo -e "${password}\n${password}" | passwd alter
 
+
+# Set to execute calamares without password as alter user.
 cat >> /etc/sudoers << 'EOF'
 alter ALL=NOPASSWD: /usr/bin/calamares
 alter ALL=NOPASSWD: /usr/bin/calamares_polkit
 EOF
 
 
+# Delete unnecessary files for Manjaro.
 [[ -d /usr/share/calamares/branding/manjaro ]] && rm -rf /usr/share/calamares/branding/manjaro
+
+
+# Replace wallpaper.
 if [[ -f /usr/share/backgrounds/xfce/xfce-stripes.png ]]; then
     rm /usr/share/backgrounds/xfce/xfce-stripes.png
     ln -s /usr/share/backgrounds/alter.png /usr/share/backgrounds/xfce/xfce-stripes.png
 fi
 [[ -f /usr/share/backgrounds/alter.png ]] && chmod 644 /usr/share/backgrounds/alter.png
 
 
+# Replace calamares settings when plymouth is enabled.
 if [[ $boot_splash = true ]]; then
     rm /usr/share/calamares/modules/services.conf
     mv /usr/share/calamares/modules/services-plymouth.conf /usr/share/calamares/modules/services.conf
@@ -71,6 +83,8 @@ else
     rm /usr/share/calamares/modules/services-plymouth.conf
 fi
 
+
+# Replace calamares settings when lts kernel is enabled.
 if [[ ${lts_kernel} = true ]]; then
     rm /usr/share/calamares/modules/unpackfs.conf
     mv /usr/share/calamares/modules/unpackfs-lts.conf /usr/share/calamares/modules/unpackfs.conf
@@ -81,21 +95,37 @@ else
     rm /usr/share/calamares/modules/initcpio-lts.conf
 fi
 
+
+# Enable root login with SSH.
 sed -i 's/#\(PermitRootLogin \).\+/\1yes/' /etc/ssh/sshd_config
+
+
+# Enable all mirror lists.
 sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist
+
+
+# Set to save journal logs only in memory.
 sed -i 's/#\(Storage=\)auto/\1volatile/' /etc/systemd/journald.conf
 
+
+# Set the operation when each power button is pressed in systemd power management.
 sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' /etc/systemd/logind.conf
 sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' /etc/systemd/logind.conf
 sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' /etc/systemd/logind.conf
 
-# Create Icon Cache
+
+# Create new icon cache
 gtk-update-icon-cache -f /usr/share/icons/hicolor
 
 
 # To disable start up of lightdm.
 # If it is enable, Users have to enter password.
 systemctl disable lightdm
+if [[ ${boot_splash} = true ]]; then
+    systemctl disable lightdm-plymouth.service
+fi
 systemctl enable pacman-init.service choose-mirror.service org.cups.cupsd.service
+
+
 # systemctl set-default multi-user.target
 systemctl set-default graphical.target

build.sh

@@ -3,6 +3,10 @@
 set -e -u
 
 # archiso settings
+#
+# Do not change this variable.
+# To change the settings permanently, edit the config file.
+
 iso_name=alterlinux
 iso_label="ALTER_$(date +%Y%m)"
 iso_publisher="Alter Linux <http://www.archlinux.org>"
@@ -82,13 +86,17 @@ make_basefs() {
     mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" init
     # mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "haveged intel-ucode amd-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install
     mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "haveged intel-ucode amd-ucode mkinitcpio-nfs-utils nbd efitools" install
+
+    # Install plymouth.
     if [[ ${boot_splash} = true ]]; then
         if [[ -n ${theme_pkg} ]]; then
             mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "plymouth ${theme_pkg}" install
         else
             mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "plymouth" install
         fi
     fi
+
+    # Install kernel.
     if [[ ${lts_kernel} = true ]]; then
         mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "linux-lts linux-lts-headers" install
     else
@@ -149,6 +157,14 @@ make_customize_airootfs() {
 
     # lynx -dump -nolist 'https://wiki.archlinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/x86_64/airootfs/root/install.txt
 
+
+    # customize_airootfs.sh options
+    # -p <password> : Set password.
+    # -b            : Enable boot splash.
+    # -t            : Set plymouth theme.
+    # -l            : Enable lts kernel.
+
+
     local options
     if [[ ${boot_splash} = true ]]; then
         if [[ -z ${theme_name} ]]; then
@@ -338,6 +354,7 @@ while getopts 'w:o:g:p:c:t:hbl' arg; do
         o) out_dir="${OPTARG}" ;;
         g) gpg_key="${OPTARG}" ;;
         c)
+            # compression format check.
             if [[ ${OPTARG} = "gzip" ||  ${OPTARG} = "lzma" ||  ${OPTARG} = "lzo" ||  ${OPTARG} = "lz4" ||  ${OPTARG} = "xz" ||  ${OPTARG} = "zstd" ]]; then
                 sfs_comp="${OPTARG}"
             else
@@ -358,6 +375,7 @@ done
 
 mkdir -p ${work_dir}
 
+# Show Alter Linux build options.
 [[ ${boot_splash} = true ]] && echo "Boot splash is enabled."; echo "Theme is used ${theme_name}."
 [[ ${lts_kernel} = true ]] && echo "LTS kernel is enabled."
 echo "Live user password is ${password}."

config

@@ -1,11 +1,36 @@
 #!/usr/bin/env bash
 
+# Alter Linux build config
+# The variables here will override the default values.
+# This configuration file follows the bash syntax.
+
+iso_name=alterlinux
 iso_label="ALTER_$(date +%Y%m)"
 iso_publisher="Alter Linux <http://www.archlinux.org>"
 iso_application="Alter Linux Live/Rescue CD"
+iso_version=$(date +%Y.%m.%d)
+install_dir=alter
 work_dir=work
 out_dir=out
 gpg_key=
 
+# AlterLinux settings
+password=alter
+
+# Set to true to enable plymouth.(-b)
+boot_splash=false
+
+# Set to true to build using the lts kernel.(-l)
+lts_kernel=false
+
+# Set the theme name of plymouth.
 theme_name="alter-logo"
-theme_pkg="plymouth-theme-alter-logo-git"
+
+# Set the package name of the plymouth theme.
+# Install only if plymouth is enabled.
+# If it is not packaged, leave this item empty and place those files in airootfs.
+theme_pkg="plymouth-theme-alter-logo-git"
+
+# See the `mksquashfs` help for details on these items.
+sfs_comp="zstd"
+sfs_comp_opt=""

mkalteriso

@@ -17,7 +17,7 @@ install_dir="alter"
 work_dir="work"
 out_dir="out"
 sfs_mode="sfs"
-sfs_comp="xz"
+sfs_comp="zstd"
 sfs_comp_opt=""
 gpg_key=
 
@@ -91,6 +91,7 @@ _usage ()
     echo "                     Default: '${sfs_comp}'"
     echo "    -t <options>     Set compressor-specific options. Run 'mksquashfs -h' for more help."
     echo "                     Default: empty"
+    # Verbose output is forced on.
     # echo "    -v               Enable verbose output"
     echo "    -h               This message"
     echo " commands:"

packages.x86_64

@@ -193,6 +193,7 @@ vlc
 
 
 #-- pacmage management --#
+eg-installer
 pamac-gtk
 yay-bin
 

pacman.conf

@@ -86,13 +86,15 @@ Include = /etc/pacman.d/mirrorlist
 Include = /etc/pacman.d/mirrorlist
 
 [alter-stable]
+# The contents of these servers are all common.
 Server = https://sereneteam.github.io/alter-repo/alter-stable/$arch
 Server = https://ja.osdn.net/projects/serene/storage/repo/alter-stable/$arch
 Server = https://h.0u0.biz/repo/alter-stable/$arch
-
 SigLevel = Optional TrustAll
 
 # [hayao]
+# This is Yamada Hayao's personal repository.
+# It was used early but is now disabled.
 # Server = https://hayao0819.github.io/archlinux-repo/repo/$arch
 # SigLevel = Optional TrustAll
 

wizard.sh

@@ -46,6 +46,7 @@ function select_comp_type () {
 
 function set_comp_option () {
 
+    # lzmaには詳細なオプションはありません。
     if [[ ! ${comp_type} = "lzma" ]]; then
         local yn
         local details
@@ -155,6 +156,7 @@ function set_password () {
     echo
 }
 
+# 最終的なbuild.shのオプションを生成
 function generate_argument () {
     if [[ ${plymouth} = true ]]; then
         argument="${argument} -b"
@@ -167,13 +169,15 @@ function generate_argument () {
     fi
 }
 
+#　上の質問の関数を実行
 function ask () {
     enable_plymouth
     select_comp_type
     set_comp_option
     set_password
 }
 
+# 将来的なビルド用の確認（このスクリプトは将来的には自動でcloneしビルドすることを目指しています。）
 function lastcheck () {
     echo "以下の設定でビルドを開始します。"
     echo
@@ -193,7 +197,10 @@ function lastcheck () {
 }
 
 
+# 関数を実行
 ask
 lastcheck
 generate_argument
+
+# build.shの引数を表示（デバッグ用）
 echo ${argument}