diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-09-13 22:35:30 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-09-13 22:35:30 -0300 |
| commit | 4b38c919cbb133c35a06b330e8de9f305c5b4792 (patch) | |
| tree | 0f995b2f9a80bbe1975bd33e89cb67609c46d144 /configs/baseline/build.sh | |
| parent | aaddf796dcaa9c62859c386d81abc4bfb9e02eec (diff) | |
| parent | 83cebf9e43fb3734c003ae358c4d308728dca7e4 (diff) | |
Merge branch 'master' of gparabola:archiso
Conflicts:
README
archiso/Makefile
archiso/hooks/archiso
archiso/hooks/archiso_loop_mnt
archiso/hooks/archiso_pxe_nbd
archiso/install/archiso
archiso/install/archiso_loop_mnt
archiso/install/archiso_pxe_nbd
archiso/mkarchiso
archiso/testiso
configs/baseline/build.sh
configs/releng/build.sh
configs/releng/packages.i686
configs/releng/packages.x86_64
configs/releng/root-image/etc/hosts
configs/releng/root-image/etc/issue
configs/releng/root-image/etc/rc.conf
configs/releng/syslinux.dual/archiso_pxe32.cfg
configs/releng/syslinux.dual/archiso_pxe64.cfg
configs/releng/syslinux/archiso_head.cfg
configs/releng/syslinux/archiso_pxe.cfg
configs/releng/syslinux/archiso_sys.cfg
Diffstat (limited to 'configs/baseline/build.sh')
| -rwxr-xr-x | configs/baseline/build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 06b76ba..02f0fb5 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -23,7 +23,7 @@ make_setup_mkinitcpio() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then cp /usr/lib/initcpio/hooks/archiso ${work_dir}/root-image/usr/lib/initcpio/hooks cp /usr/lib/initcpio/install/archiso ${work_dir}/root-image/usr/lib/initcpio/install - cp ${script_path}/mkinitcpio.conf ${work_dir}/root-image/etc/mkinitcpio-archiso.conf + cp ${script_path}/mkinitcpio.conf ${work_dir}/root-image/etc/mkinitcpio-libreiso.conf : > ${work_dir}/build.${FUNCNAME} fi } @@ -33,7 +33,7 @@ make_boot() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch} mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" \ - -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux-libre -g /boot/libreiso.img' \ + -r 'mkinitcpio -c /etc/mkinitcpio-libreiso.conf -k /boot/vmlinuz-linux-libre -g /boot/libreiso.img' \ run cp ${work_dir}/root-image/boot/libreiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/libreiso.img cp ${work_dir}/root-image/boot/vmlinuz-linux-libre ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz |