diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-08-21 20:42:53 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-08-21 20:42:53 -0300 |
| commit | 64a660adb9a1ad658874759c186e0e9cbf138e63 (patch) | |
| tree | 310ed3d87e92f803f9951e7bc402bf616339e3ff /configs/releng/build.sh | |
| parent | be5fc1d5c788df0f2d8d050e97581977caf133a3 (diff) | |
| parent | aca6dbaec9cc8af34ffad79b48054ac6b405174c (diff) | |
Merge branch 'master' of https://projects.archlinux.org/git/archiso
Conflicts:
configs/releng/packages.i686
configs/releng/packages.x86_64
Diffstat (limited to 'configs/releng/build.sh')
| -rwxr-xr-x | configs/releng/build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 8c96c76..4a48b0a 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -167,7 +167,7 @@ make_prepare() { # args: $1 (core | netinstall) make_iso() { local _iso_type=${1} - mkarchiso ${verbose} checksum "${work_dir}" + mkarchiso ${verbose} -D "${install_dir}" checksum "${work_dir}" mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}" "${name}-${version}-${_iso_type}-${arch}.iso" } @@ -211,7 +211,7 @@ make_dual() { sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/dual/iso/${install_dir}/boot/syslinux/${_cfg##*/} done - mkarchiso ${verbose} checksum "${work_dir}/dual" + mkarchiso ${verbose} -D "${install_dir}" checksum "${work_dir}/dual" mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}/dual" "${name}-${version}-${_iso_type}-dual.iso" : > ${work_dir}/dual/build.${FUNCNAME}_${_iso_type} fi |