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>2009-12-02 02:35:26 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2009-12-02 02:35:26 -0300
commit5f8999e3ea9b122892d62ac9e88b155d8fe64821 (patch)
tree42bdf9cb3b496965fe2e2ea7bd782bed4e3b40bf
parent4d1fb6a58deda81dd64dbbe377531ab82ea54e5e (diff)
Abort mkarchiso if isolinux.cfg is not found.
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-rwxr-xr-xarchiso/mkarchiso7
1 files changed, 5 insertions, 2 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index ea3089a..db04561 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -218,14 +218,17 @@ _imgcommon () {
echo "Removing existing bootable image..."
rm -rf "${imgname}"
else
- echo "error: Image '${imgname}' already exists, aborting."
+ echo "Error: Image '${imgname}' already exists, aborting."
exit 1
fi
fi
cp "${work_dir}/isomounts" "${work_dir}/iso/"
- [ -f ${work_dir}/iso/boot/isolinux/isolinux.cfg ] && sed "s|archisolabel=[^ ]*|archisolabel=${LABEL}|" -i ${work_dir}/iso/boot/isolinux/isolinux.cfg
+ if ! sed "s|archisolabel=[^ ]*|archisolabel=${LABEL}|" -i ${work_dir}/iso/boot/isolinux/isolinux.cfg; then
+ echo "Error: ${work_dir}/iso/boot/isolinux/isolinux.cfg, doesn't exist, aborting."
+ exit 1
+ fi
}
command_iso () {