From e03ed816e09cfbc0d7edaaf437c277574bf9104f Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Mon, 28 Nov 2011 10:35:05 -0300 Subject: [archiso] Use different logic when archisodevice == cow_device * Now bootmnt/img_dev is always a ro-mount, and cowspace is first ro-mount then rw-mount. * Fix a "hidden" bug: at the time of test [[ -ef ]], if devices nodes are not ready, such test will fail then archisodevice will mounted ro and when cow_device is mounted to be rw it fails. (I recently suffered this on a machine with slow USB) Signed-off-by: Gerardo Exequiel Pozzi --- archiso/hooks/archiso_loop_mnt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'archiso/hooks/archiso_loop_mnt') diff --git a/archiso/hooks/archiso_loop_mnt b/archiso/hooks/archiso_loop_mnt index c1b25df..e52dc69 100644 --- a/archiso/hooks/archiso_loop_mnt +++ b/archiso/hooks/archiso_loop_mnt @@ -11,11 +11,7 @@ archiso_loop_mount_handler () { newroot="${1}" msg ":: Setup a loop device from ${img_loop} located at device ${img_dev}" - if [[ "${img_dev}" -ef "${cow_device}" ]]; then - _mnt_dev "${img_dev}" "/run/archiso/img_dev" - else - _mnt_dev "${img_dev}" "/run/archiso/img_dev" "-r" - fi + _mnt_dev "${img_dev}" "/run/archiso/img_dev" "-r" _dev_loop=$(losetup -f) if ! losetup "${_dev_loop}" "/run/archiso/img_dev/${img_loop}"; then -- cgit v1.2.3-70-g09d2