[arch-releng] [PATCH 12/12] [archiso] Remove uneeded /run/archiso/img_dev_loop

[Gerardo Exequiel Pozzi]

Superseded by /run/archiso/used_block_devices

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
---
 archiso/hooks/archiso_loop_mnt |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/archiso/hooks/archiso_loop_mnt b/archiso/hooks/archiso_loop_mnt
index 61ddcd4..f38d0d6 100644
--- a/archiso/hooks/archiso_loop_mnt
+++ b/archiso/hooks/archiso_loop_mnt
@@ -10,15 +10,13 @@ run_hook () {
 archiso_loop_mount_handler () {
     newroot="${1}"
 
-    local _dev_loop
-
     msg ":: Setup a loop device from ${img_loop} located at device ${img_dev}"
     _mnt_dev "${img_dev}" "/run/archiso/img_dev" "-r"
     if [[ "${copytoram}" != "y" ]]; then
         echo $(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
+    if ! losetup --find --read-only "/run/archiso/img_dev/${img_loop}"; then
         echo "ERROR: Setting loopback device for file '/run/archiso/img_dev/${img_loop}'"
         launch_interactive_shell
     fi
@@ -26,9 +24,6 @@ archiso_loop_mount_handler () {
     archiso_mount_handler ${newroot}
 
     if [[ "${copytoram}" == "y" ]]; then
-        losetup -d ${_dev_loop}
-        umount /run/archiso/img_dev
-    else
-        echo ${_dev_loop} > /run/archiso/img_dev_loop
+        umount -d /run/archiso/img_dev
     fi
 }
-- 
1.7.9.1