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
commit68f5217346d6a2da96ce13408682e081193b7b26 (patch)
treeb7487e4c5c576ee309e3b3a0721fb80b74a707c3
parentc78d8723dab0fcaac2c6d28515572734682c6311 (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--hooks/archiso2
-rw-r--r--hooks/archiso_loop_mnt2
2 files changed, 2 insertions, 2 deletions
diff --git a/hooks/archiso b/hooks/archiso
index fcfe820..23459e7 100644
--- a/hooks/archiso
+++ b/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/hooks/archiso_loop_mnt b/hooks/archiso_loop_mnt
index a02cfac..46338e5 100644
--- a/hooks/archiso_loop_mnt
+++ b/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
}