Johannes/ISO
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[archiso] Place *.sqfs images in /${install_dir}/${arch}/

Browse Source 
Unify with dir layout of -dual images.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
This commit is contained in:
Gerardo Exequiel Pozzi 2010-10-21 19:35:57 -03:00
parent 07869c5735
commit 02caf25be9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archiso/mkarchiso
View File

@ -12,6 +12,7 @@ CREATE_DEFAULT="n"
INSTALL_DIR="arch" INSTALL_DIR="arch"
APPNAME=$(basename "${0}") APPNAME=$(basename "${0}")
ARCH=$(uname -m)
# usage: usage <exitvalue> # usage: usage <exitvalue>
usage () usage ()
@ -115,7 +116,7 @@ _pacman ()
command_create () { command_create () {
echo "====> Creating working directory: ${work_dir}" 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/" mkdir -p "${work_dir}/root-image/"
if [ "${PKGLIST}" != "" ]; then if [ "${PKGLIST}" != "" ]; then
@ -157,7 +158,7 @@ _mksquash () {
return 1 return 1
fi 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}'" echo "====> Generating SquashFS image for '${1}'"
if [ -e "${sqimg}" ]; then if [ -e "${sqimg}" ]; then
dirhaschanged=$(find ${1} -newer ${sqimg}) dirhaschanged=$(find ${1} -newer ${sqimg})
@ -215,7 +216,8 @@ _imgcommon () {
fi fi
if ! sed "s|archisolabel=[^ ]*|archisolabel=${LABEL}|g; 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." echo "Error: ${work_dir}/iso/syslinux/syslinux.cfg, doesn't exist, aborting."
exit 1 exit 1
fi fi