Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-07-09 16:43:16 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-07-09 16:46:29 -0300
commit6adf48d06b4b64ef04c4f366404af956e7fdfee2 (patch)
tree4211a4d926e15c6a2339b963e9b75289cb2a5514
parent1bbeeb0e5b54b7c8f2de959d5f5dece90b7825a1 (diff)
Call launch_interactive_shell in more cases of error.
A shell prompt is at least better than a kernel panic :) Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-rw-r--r--archiso/hooks/archiso12
1 files changed, 10 insertions, 2 deletions
diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso
index ef8dc58..4d6682a 100644
--- a/archiso/hooks/archiso
+++ b/archiso/hooks/archiso
@@ -27,12 +27,20 @@ _mnt_squashfs() {
if [ "${copytoram}" = "y" ]; then
msg -n ":: Copying squashfs image to RAM..."
/bin/cp "${img}" "/copytoram/${img_fullname}"
+ if [ $? -ne 0 ]; then
+ echo "ERROR: while copy ${img} to /copytoram/${img_fullname}"
+ launch_interactive_shell
+ fi
img="/copytoram/${img_fullname}"
msg "done."
fi
mkdir -p "${tmp_mnt}"
/bin/mount -r -t squashfs "${img}" "${tmp_mnt}"
+ if [ $? -ne 0 ]; then
+ echo "ERROR: while mounting ${img} to ${tmp_mnt}"
+ launch_interactive_shell
+ fi
if [ "/${mnt#/*/}" = "/" ]; then
_mnt_aufs "${tmp_mnt}" "${mnt}"
@@ -41,7 +49,7 @@ _mnt_squashfs() {
fi
}
-run_hook () {
+run_hook() {
if [ "x${arch}" = "x" ]; then
arch="$(uname -m)"
fi
@@ -122,7 +130,7 @@ archiso_mount_handler() {
/bin/mount -t aufs -o dirs=/rw_branch=rw none "${newroot}"
if [ $? -ne 0 ]; then
echo "ERROR: while mounting root (aufs) filesystem."
- exit 1
+ launch_interactive_shell
fi
msg ":: Mounting images"