summaryrefslogtreecommitdiff
path: root/archiso
diff options
context:
space:
mode:
authorAdam Purkrt <adam@purkrt.net>2015-08-30 00:39:41 +0200
committerGerardo Exequiel Pozzi <vmlinuz386@gmail.com>2015-09-13 14:45:20 -0300
commitd35d87f252caa97b716ce819ded9972e7c6609e4 (patch)
tree9410bc2023263e5aeeb2b518702f2a68c939d3f2 /archiso
parent217a05eb86f3e8126aa61445185d1a581ae2ecb2 (diff)
downloadarchiso32-d35d87f252caa97b716ce819ded9972e7c6609e4.tar.xz
cleaner boot from loopmounted iso file
Currently, when booting loopmounted iso file, it is necessary to specify not only img_dev and img_loop (which should be sufficient), but also archisolabel or archisodevice. With this patch, archisodevice is directly populated with the correct loop device, and it is not necessary to specify the label when booting from loopmounted iso, which makes for leaner and cleaner grub.cfg.
Diffstat (limited to 'archiso')
-rw-r--r--archiso/initcpio/hooks/archiso_loop_mnt4
1 files changed, 3 insertions, 1 deletions
diff --git a/archiso/initcpio/hooks/archiso_loop_mnt b/archiso/initcpio/hooks/archiso_loop_mnt
index 46338e5..f95a47d 100644
--- a/archiso/initcpio/hooks/archiso_loop_mnt
+++ b/archiso/initcpio/hooks/archiso_loop_mnt
@@ -18,7 +18,9 @@ archiso_loop_mount_handler () {
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 _dev_loop=$(losetup --find --show --read-only "/run/archiso/img_dev/${img_loop}"); then
+ archisodevice="${_dev_loop}"
+ else
echo "ERROR: Setting loopback device for file '/run/archiso/img_dev/${img_loop}'"
launch_interactive_shell
fi