Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2015-05-28 08:59:41 +0200
committerGerardo Exequiel Pozzi <vmlinuz386@gmail.com>2015-05-29 13:10:37 -0300
commitb1011376cf41314d754e846712e4bafb70ff56da (patch)
tree500715f873062aa146b417febc9dea152b468f10
parentf0452f22ca65b91e51dcd3fb335b2855d03273d4 (diff)
explicitly detach loop device on umount and silent losetup error
Umount detaches the loop device automatically, but let's make it explicit to be sure. Additionally losetup gives: losetup: /dev/loop0: detach failed: No such device or address This is kind of expected, let's silent the error message. Signed-off-by: Christian Hesse <mail@eworm.de>
-rw-r--r--archiso/initcpio/hooks/archiso2
-rw-r--r--archiso/initcpio/hooks/archiso_loop_mnt2
2 files changed, 2 insertions, 2 deletions
diff --git a/archiso/initcpio/hooks/archiso b/archiso/initcpio/hooks/archiso
index fcfe820..23459e7 100644
--- a/archiso/initcpio/hooks/archiso
+++ b/archiso/initcpio/hooks/archiso
@@ -182,7 +182,7 @@ archiso_mount_handler() {
fi
if [[ "${copytoram}" == "y" ]]; then
- umount /run/archiso/bootmnt
+ umount -d /run/archiso/bootmnt
fi
}
diff --git a/archiso/initcpio/hooks/archiso_loop_mnt b/archiso/initcpio/hooks/archiso_loop_mnt
index a02cfac..46338e5 100644
--- a/archiso/initcpio/hooks/archiso_loop_mnt
+++ b/archiso/initcpio/hooks/archiso_loop_mnt
@@ -26,7 +26,7 @@ archiso_loop_mount_handler () {
archiso_mount_handler ${newroot}
if [[ "${copytoram}" == "y" ]]; then
- losetup -d ${_dev_loop}
+ losetup -d ${_dev_loop} 2>/dev/null
umount /run/archiso/img_dev
fi
}