From d0d7eb25cf503753cb1452756059a281289e7a41 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Fri, 10 Dec 2021 09:18:19 +0200
Subject: hooks/archiso{,_loop_mnt}: remove /run/archiso/used_block_devices

Now that the archiso_shutdown is removed, nothing uses this file anymore and it is not needed.

Additionally, cowspace is mounted read-write on first mount, not mounted read-only and then remounted read-write.
---
 hooks/archiso          | 12 +-----------
 hooks/archiso_loop_mnt |  7 ++-----
 2 files changed, 3 insertions(+), 16 deletions(-)

(limited to 'hooks')

diff --git a/hooks/archiso b/hooks/archiso
index 9391b46..59c5765 100644
--- a/hooks/archiso
+++ b/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
@@ -89,7 +86,6 @@ _mnt_sfs() {
         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"
 }
 
@@ -112,7 +108,6 @@ _mnt_erofs() {
         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"
 }
 
@@ -200,9 +195,6 @@ archiso_mount_handler() {
 
     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
@@ -252,9 +244,7 @@ archiso_mount_handler() {
     fi
 
     if [ -n "${cow_device}" ]; then
-        _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"
+        _mnt_dev "${cow_device}" "/run/archiso/cowspace" "-w" "${cow_flags}"
     else
         msg ":: Mounting /run/archiso/cowspace (tmpfs) filesystem, size=${cow_spacesize}..."
         mkdir -p /run/archiso/cowspace
diff --git a/hooks/archiso_loop_mnt b/hooks/archiso_loop_mnt
index a5a71e8..05dc056 100644
--- a/hooks/archiso_loop_mnt
+++ b/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
-- 
cgit v1.2.3-70-g09d2