diff options
| author | Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> | 2010-10-21 19:35:57 -0300 |
|---|---|---|
| committer | Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> | 2010-12-07 23:48:23 -0300 |
| commit | 02caf25be944d7321506d4eb19769f7814f188f1 (patch) | |
| tree | 05b9c0f3ed6d2190e4ab2de887876929975c2399 | |
| parent | 07869c57350f132b22a9419776d3895fafd98e76 (diff) | |
[archiso] Place *.sqfs images in /${install_dir}/${arch}/
Unify with dir layout of -dual images.
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
| -rwxr-xr-x | archiso/mkarchiso | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 5a7b412..e0cf473 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -12,6 +12,7 @@ CREATE_DEFAULT="n" INSTALL_DIR="arch" APPNAME=$(basename "${0}") +ARCH=$(uname -m) # usage: usage <exitvalue> usage () @@ -115,7 +116,7 @@ _pacman () command_create () { echo "====> Creating working directory: ${work_dir}" - mkdir -p "${work_dir}/iso/${INSTALL_DIR}" + mkdir -p "${work_dir}/iso/${INSTALL_DIR}/${ARCH}" mkdir -p "${work_dir}/root-image/" if [ "${PKGLIST}" != "" ]; then @@ -157,7 +158,7 @@ _mksquash () { return 1 fi - sqimg="${work_dir}/iso/${INSTALL_DIR}/$(basename ${1}).sqfs" + sqimg="${work_dir}/iso/${INSTALL_DIR}/${ARCH}/$(basename ${1}).sqfs" echo "====> Generating SquashFS image for '${1}'" if [ -e "${sqimg}" ]; then dirhaschanged=$(find ${1} -newer ${sqimg}) @@ -215,7 +216,8 @@ _imgcommon () { fi if ! sed "s|archisolabel=[^ ]*|archisolabel=${LABEL}|g; - s|%INSTALL_DIR%|${INSTALL_DIR}|g" -i ${work_dir}/iso/syslinux/syslinux.cfg; then + s|%INSTALL_DIR%|${INSTALL_DIR}|g; + s|%ARCH%|${ARCH}|g" -i ${work_dir}/iso/syslinux/syslinux.cfg; then echo "Error: ${work_dir}/iso/syslinux/syslinux.cfg, doesn't exist, aborting." exit 1 fi |