summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2008-10-19 23:18:16 -0500
committerAaron Griffin <aaronmgriffin@gmail.com>2008-10-19 23:18:16 -0500
commitf3110a21eb9e19de46b68bbcff0d94c58e2f7529 (patch)
tree26181c525ce9bfa4390d8070da005261c035768f
parenteb6693901d70ad0635f544d5b9b7b91c8feab064 (diff)
downloadarchiso32-f3110a21eb9e19de46b68bbcff0d94c58e2f7529.tar.xz
Move mountfile copying code
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rwxr-xr-xarchiso/mkarchiso9
1 files changed, 6 insertions, 3 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 2fcc361..857d588 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -143,9 +143,6 @@ command_install () {
# pacman DBs are big, delete all sync dbs
rm -rf "${work_dir}/var/lib/pacman/sync"
-
- #TODO test for existance of images in work_dir
- cp "${MOUNTFILE}" "${work_dir}/mounts"
}
# command_squash path image
@@ -189,6 +186,12 @@ command_image () {
exit 1
fi
+ if [ ! -e "${MOUNTFILE}" ]; then
+ echo "error: mount file '${MOUNTFILE}' does not exist, aborting."
+ exit 1
+ fi
+ cp "${MOUNTFILE}" "${work_dir}/mounts"
+
kernelver=$(_kversion)
basedir=${work_dir}
[ "${work_dir:0:1}" != "/" ] && basedir="$(pwd)/${work_dir}"