[update] : New mkinitcpio-archiso

Author: Hayao0819

system/initcpio/hooks/archiso

@@ -13,7 +13,6 @@ _mnt_dmsnapshot() {
     local ro_dev ro_dev_size rw_dev
 
     ro_dev="$(losetup --find --show --read-only -- "${img}")"
-    printf '%s\n' "${ro_dev}" >>/run/archiso/used_block_devices
     ro_dev_size="$(blockdev --getsz "${ro_dev}")"
 
     if [ "${cow_persistent}" = "P" ]; then
@@ -33,7 +32,6 @@ _mnt_dmsnapshot() {
     fi
 
     rw_dev="$(losetup --find --show "/run/archiso/cowspace/${cow_directory}/${img_name}.cow")"
-    printf '%s\n' "${rw_dev}" >>/run/archiso/used_block_devices
 
     dmsetup create "${dm_snap_name}" --table \
         "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} ${cow_chunksize}"
@@ -43,7 +41,6 @@ _mnt_dmsnapshot() {
     fi
 
     _mnt_dev "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" "-w" "defaults"
-    readlink -f "/dev/mapper/${dm_snap_name}" >>/run/archiso/used_block_devices
 }
 
 # args: source, newroot, mountpoint
@@ -58,16 +55,16 @@ _mnt_overlayfs() {
 }
 
 # args: /path/to/image_file, mountpoint
-_mnt_sfs() {
+_mnt_fs() {
     local img="${1}"
     local mnt="${2}"
     local img_fullname="${img##*/}"
-    local sfs_dev
+    local img_loopdev
 
     # shellcheck disable=SC2154
     # defined via initcpio's parse_cmdline()
     if [ "${copytoram}" = "y" ]; then
-        msg -n ":: Copying squashfs image to RAM..."
+        msg -n ":: Copying rootfs image to RAM..."
 
         # in case we have pv use it to display copy progress feedback otherwise
         # fallback to using plain cp
@@ -88,32 +85,8 @@ _mnt_sfs() {
         img="/run/archiso/copytoram/${img_fullname}"
         msg "done."
     fi
-    sfs_dev="$(losetup --find --show --read-only -- "${img}")"
-    echo "${sfs_dev}" >>/run/archiso/used_block_devices
-    _mnt_dev "${sfs_dev}" "${mnt}" "-r" "defaults"
-}
-
-# args: /path/to/image_file, mountpoint
-_mnt_erofs() {
-    local img="${1}"
-    local mnt="${2}"
-    local img_fullname="${img##*/}"
-    local erofs_dev
-
-    # shellcheck disable=SC2154
-    # defined via initcpio's parse_cmdline()
-    if [ "${copytoram}" = "y" ]; then
-        msg -n ":: Copying EROFS image to RAM..."
-        if ! cp -- "${img}" "/run/archiso/copytoram/${img_fullname}"; then
-            echo "ERROR: while copy '${img}' to '/run/archiso/copytoram/${img_fullname}'"
-            launch_interactive_shell
-        fi
-        img="/run/archiso/copytoram/${img_fullname}"
-        msg "done."
-    fi
-    erofs_dev="$(losetup --find --show --read-only -- "${img}")"
-    echo "${erofs_dev}" >>/run/archiso/used_block_devices
-    _mnt_dev "${erofs_dev}" "${mnt}" "-r" "defaults" "erofs"
+    img_loopdev="$(losetup --find --show --read-only -- "${img}")"
+    _mnt_dev "${img_loopdev}" "${mnt}" "-r" "defaults"
 }
 
 # args: device, mountpoint, flags, opts
@@ -122,7 +95,6 @@ _mnt_dev() {
     local mnt="${2}"
     local flg="${3}"
     local opts="${4}"
-    local fstype="${5:-auto}"
 
     mkdir -p "${mnt}"
 
@@ -135,7 +107,7 @@ _mnt_dev() {
         launch_interactive_shell
     done
 
-    if mount -t "${fstype}" -o "${opts}" "${flg}" "${dev}" "${mnt}"; then
+    if mount -o "${opts}" "${flg}" "${dev}" "${mnt}"; then
         msg ":: Device '${dev}' mounted successfully."
     else
         echo "ERROR; Failed to mount '${dev}'"
@@ -158,7 +130,7 @@ _verify_signature() {
     local _status
     local sigfile="${1}"
     cd "/run/archiso/bootmnt/${archisobasedir}/${arch}" || exit 1
-    gpg --homedir /gpg --status-fd 1 --verify "${sigfile}" 2>/dev/null | grep -qE '^\[GNUPG:\] GOODSIG'
+    gpg --homedir /gpg --status-fd 1 --verify "${sigfile}" 2>/dev/null | grep -E '^\[GNUPG:\] GOODSIG'
     _status=$?
     cd -- "${OLDPWD}" || exit 1
     return ${_status}
@@ -197,22 +169,19 @@ run_hook() {
 # args: /path/to/newroot
 archiso_mount_handler() {
     local newroot="${1}"
-    local sigfile
+    local sigfile fs_img
 
     if ! mountpoint -q "/run/archiso/bootmnt"; then
         _mnt_dev "${archisodevice}" "/run/archiso/bootmnt" "-r" "defaults"
-        if [ "${copytoram}" != "y" ]; then
-            readlink -f "${archisodevice}" >>/run/archiso/used_block_devices
-        fi
     fi
 
     # shellcheck disable=SC2154
     # defined via initcpio's parse_cmdline()
     if [ "${checksum}" = "y" ]; then
         if [ -f "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sha512" ]; then
-            msg -n ":: Self-test requested, please wait..."
+            msg ":: Self-test requested, please wait..."
             if _verify_checksum; then
-                msg "done. Checksum is OK, continue booting."
+                msg "Checksum is OK, continue booting."
             else
                 echo "ERROR: one or more files are corrupted"
                 echo "see /tmp/checksum.log for details"
@@ -233,9 +202,9 @@ archiso_mount_handler() {
             sigfile="airootfs.erofs.sig"
         fi
         if [ -n "${sigfile}" ]; then
-            msg -n ":: Signature verification requested, please wait..."
+            msg ":: Signature verification requested, please wait..."
             if _verify_signature "${sigfile}"; then
-                msg "done. Signature is OK, continue booting."
+                msg "Signature is OK, continue booting."
             else
                 echo "ERROR: one or more files are corrupted"
                 launch_interactive_shell
@@ -253,8 +222,9 @@ archiso_mount_handler() {
     fi
 
     if [ -n "${cow_device}" ]; then
+        # Mount cow_device read-only at first and remount it read-write right after. This prevents errors when the
+        # device is already mounted read-only somewhere else (e.g. if cow_device and archisodevice are the same).
         _mnt_dev "${cow_device}" "/run/archiso/cowspace" "-r" "${cow_flags}"
-        readlink -f "${cow_device}" >>/run/archiso/used_block_devices
         mount -o remount,rw "/run/archiso/cowspace"
     else
         msg ":: Mounting /run/archiso/cowspace (tmpfs) filesystem, size=${cow_spacesize}..."
@@ -265,10 +235,14 @@ archiso_mount_handler() {
     chmod 0700 "/run/archiso/cowspace/${cow_directory}"
 
     if [ -f "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs" ]; then
-        _mnt_sfs "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs" "/run/archiso/airootfs"
+        fs_img="/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs"
     elif [ -f "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.erofs" ]; then
-        _mnt_erofs "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.erofs" "/run/archiso/airootfs"
+        fs_img="/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.erofs"
+    else
+        echo "ERROR: no root file system image found"
+        launch_interactive_shell
     fi
+    _mnt_fs "${fs_img}" "/run/archiso/airootfs"
     if [ -f "/run/archiso/airootfs/airootfs.img" ]; then
         _mnt_dmsnapshot "/run/archiso/airootfs/airootfs.img" "${newroot}" "/"
     else

system/initcpio/hooks/archiso_loop_mnt

@@ -21,11 +21,6 @@ archiso_loop_mount_handler() {
 
     msg ":: Setup a loop device from ${img_loop} located at device ${img_dev}"
     _mnt_dev "${img_dev}" "/run/archiso/img_dev" "-r" "${img_flags}"
-    # shellcheck disable=SC2154
-    # defined via initcpio's parse_cmdline()
-    if [ "${copytoram}" != "y" ]; then
-        readlink -f "${img_dev}" >>/run/archiso/used_block_devices
-    fi
 
     if _dev_loop=$(losetup --find --show --read-only "/run/archiso/img_dev/${img_loop}"); then
         export archisodevice="${_dev_loop}"
@@ -36,6 +31,8 @@ archiso_loop_mount_handler() {
 
     archiso_mount_handler "${newroot}"
 
+    # shellcheck disable=SC2154
+    # defined via initcpio's parse_cmdline()
     if [ "${copytoram}" = "y" ]; then
         losetup -d "${_dev_loop}" 2>/dev/null
         umount /run/archiso/img_dev

system/initcpio/hooks/archiso_pxe_common

@@ -32,7 +32,9 @@ run_hook() {
         fi
 
         # setup network and save some values
-        if ! ipconfig -t 20 "ip=${ip}"; then
+        # Timeout is set to 60 by default to avoid issues with STP default values
+        # (15 second listening, 15 seconds learning and 20 seconds for max age)
+        if ! ipconfig -t 60 "ip=${ip}"; then
             echo "ERROR; Failed to configure network"
             echo "   Falling back to interactive prompt"
             echo "   You can try to fix the problem manually, log out when you are finished"