[update] : mkinitcpio-archiso v63-1

Author: Hayao0819

system/initcpio/hooks/archiso

@@ -96,8 +96,6 @@ _mnt_dev() {
     local flg="${3}"
     local opts="${4}"
 
-    mkdir -p "${mnt}"
-
     msg ":: Mounting '${dev}' to '${mnt}'"
 
     while ! poll_device "${dev}" 30; do
@@ -107,7 +105,7 @@ _mnt_dev() {
         launch_interactive_shell
     done
 
-    if mount -o "${opts}" "${flg}" "${dev}" "${mnt}"; then
+    if mount --mkdir -o "${opts}" "${flg}" "${dev}" "${mnt}"; then
         msg ":: Device '${dev}' mounted successfully."
     else
         echo "ERROR; Failed to mount '${dev}'"
@@ -217,8 +215,7 @@ archiso_mount_handler() {
 
     if [ "${copytoram}" = "y" ]; then
         msg ":: Mounting /run/archiso/copytoram (tmpfs) filesystem, size=${copytoram_size}"
-        mkdir -p /run/archiso/copytoram
-        mount -t tmpfs -o "size=${copytoram_size}",mode=0755 copytoram /run/archiso/copytoram
+        mount --mkdir -t tmpfs -o "size=${copytoram_size}",mode=0755 copytoram /run/archiso/copytoram
     fi
 
     if [ -n "${cow_device}" ]; then
@@ -228,8 +225,7 @@ archiso_mount_handler() {
         mount -o remount,rw "/run/archiso/cowspace"
     else
         msg ":: Mounting /run/archiso/cowspace (tmpfs) filesystem, size=${cow_spacesize}..."
-        mkdir -p /run/archiso/cowspace
-        mount -t tmpfs -o "size=${cow_spacesize}",mode=0755 cowspace /run/archiso/cowspace
+        mount --mkdir -t tmpfs -o "size=${cow_spacesize}",mode=0755 cowspace /run/archiso/cowspace
     fi
     mkdir -p "/run/archiso/cowspace/${cow_directory}"
     chmod 0700 "/run/archiso/cowspace/${cow_directory}"

system/initcpio/hooks/archiso_pxe_http

@@ -42,8 +42,7 @@ archiso_pxe_http_mount_handler() {
     local img_type="sfs"
 
     msg ":: Mounting /run/archiso/httpspace (tmpfs) filesystem, size='${archiso_http_spc}'"
-    mkdir -p "/run/archiso/httpspace"
-    mount -t tmpfs -o size="${archiso_http_spc}",mode=0755 httpspace "/run/archiso/httpspace"
+    mount --mkdir -t tmpfs -o size="${archiso_http_spc}",mode=0755 httpspace "/run/archiso/httpspace"
 
     # shellcheck disable=SC2154
     # defined via initcpio's parse_cmdline()
@@ -65,8 +64,7 @@ archiso_pxe_http_mount_handler() {
         _curl_get "${archiso_http_srv}${archisobasedir}/${arch}/airootfs.${img_type}.sig" "/${arch}"
     fi
 
-    mkdir -p "/run/archiso/bootmnt"
-    mount -o bind /run/archiso/httpspace /run/archiso/bootmnt
+    mount --mkdir -o bind /run/archiso/httpspace /run/archiso/bootmnt
 
     archiso_mount_handler "${newroot}"
 }

system/initcpio/hooks/archiso_shutdown

@@ -3,34 +3,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 build() {
-    add_module "amdgpu"
-    add_module "radeon"
-    add_module "nouveau"
-    add_module "i915"
-    add_module "mgag200"
-    add_module "via-agp"
-    add_module "sis-agp"
-    add_module "intel-agp"
-
-    add_module "nvidia?"
-    add_module "nvidia_modeset?"
-    add_module "nvidia_uvm?"
-    add_module "nvidia_drm?"
-
-
-    if [[ $(uname -m) == i686 ]]; then
-        add_module "amd64-agp"
-        add_module "ati-agp"
-        add_module "sworks-agp"
-        add_module "ali-agp"
-        add_module "amd-k7-agp"
-        add_module "nvidia-agp"
-        add_module "efficeon-agp"
-    fi
+    map add_checked_modules '/drivers/char/agp/' '/drivers/gpu/drm/'
 }
 
 help() {
     cat <<HELPEOF
-Adds all common KMS drivers to the initramfs image.
+Adds KMS drivers to the initramfs image. To minimize the modules in the image,
+add the autodetect hook too.
 HELPEOF
 }