diff options
| author | David P <megver83@parabola.nu> | 2018-05-16 21:08:49 -0400 |
|---|---|---|
| committer | David P <megver83@parabola.nu> | 2018-05-16 21:27:46 -0400 |
| commit | 765756ae126d57735c22d59a7c1242f01443921e (patch) | |
| tree | c5d5f3e7979f5a0098e7294d1e8dbae3aa71c562 /parabolaiso/initcpio/hooks/parabolaiso_loop_mnt | |
| parent | ff5f93347993bfdb6c58746baee006dbad7a3dd8 (diff) | |
modify entire source according to archiso32
and remove unused configs/talkingparabola-X11
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'parabolaiso/initcpio/hooks/parabolaiso_loop_mnt')
| -rw-r--r-- | parabolaiso/initcpio/hooks/parabolaiso_loop_mnt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/parabolaiso/initcpio/hooks/parabolaiso_loop_mnt b/parabolaiso/initcpio/hooks/parabolaiso_loop_mnt index 772c3b6..1a8783d 100644 --- a/parabolaiso/initcpio/hooks/parabolaiso_loop_mnt +++ b/parabolaiso/initcpio/hooks/parabolaiso_loop_mnt @@ -2,6 +2,7 @@ run_hook () { [[ -n "${img_label}" ]] && img_dev="/dev/disk/by-label/${img_label}" + [[ -z "${img_flags}" ]] && img_flags="defaults" if [[ -n "${img_dev}" && -n "${img_loop}" ]]; then mount_handler="parabolaiso_loop_mount_handler" fi @@ -13,12 +14,14 @@ parabolaiso_loop_mount_handler () { local _dev_loop msg ":: Setup a loop device from ${img_loop} located at device ${img_dev}" - _mnt_dev "${img_dev}" "/run/parabolaiso/img_dev" "-r" + _mnt_dev "${img_dev}" "/run/parabolaiso/img_dev" "-r" "${img_flags}" if [[ "${copytoram}" != "y" ]]; then echo $(readlink -f ${img_dev}) >> /run/parabolaiso/used_block_devices fi - if ! _dev_loop=$(losetup --find --show --read-only "/run/parabolaiso/img_dev/${img_loop}"); then + if _dev_loop=$(losetup --find --show --read-only "/run/parabolaiso/img_dev/${img_loop}"); then + parabolaisodevice="${_dev_loop}" + else echo "ERROR: Setting loopback device for file '/run/parabolaiso/img_dev/${img_loop}'" launch_interactive_shell fi @@ -26,7 +29,7 @@ parabolaiso_loop_mount_handler () { parabolaiso_mount_handler ${newroot} if [[ "${copytoram}" == "y" ]]; then - losetup -d ${_dev_loop} + losetup -d ${_dev_loop} 2>/dev/null umount /run/parabolaiso/img_dev fi } |