diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-07-20 16:01:16 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-07-20 16:01:16 -0300 |
| commit | 1a87fac19da7cf748c7f42d1ec183cff00998016 (patch) | |
| tree | e1754bf58be446c0612a0460abae9cf879f29fa2 /configs/baseline | |
| parent | fea6291aff50468dd0f1e40c85d6d9ee7ca972a2 (diff) | |
| parent | 27e472451e39bcec4b785101d2964e6d5f8a91d5 (diff) | |
Merge branch 'master' of https://projects.archlinux.org/git/archiso
Conflicts:
README
configs/baseline/build.sh
configs/releng/build.sh
configs/releng/packages.i686
configs/releng/packages.x86_64
configs/releng/root-image/etc/rc.d/archiso
Diffstat (limited to 'configs/baseline')
| -rwxr-xr-x | configs/baseline/build.sh | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 3561ec0..64664fc 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -10,13 +10,6 @@ arch=$(uname -m) work_dir=work verbose="n" -# This function can be called after make_basefs() -get_linux_ver() { - local ALL_kver - eval $(grep ^ALL_kver ${work_dir}/root-image/etc/mkinitcpio.d/kernel26.kver) - echo ${ALL_kver} -} - # Base installation (root-image) make_basefs() { mkarchiso ${verbose} -D "${install_dir}" -p "base" create "${work_dir}" @@ -31,12 +24,25 @@ make_customize_root_image() { fi } +# Copy mkinitcpio archiso hooks (root-image) +make_setup_mkinitcpio() { + if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then + cp /lib/initcpio/hooks/archiso ${work_dir}/root-image/lib/initcpio/hooks + cp /lib/initcpio/install/archiso ${work_dir}/root-image/lib/initcpio/install + : > ${work_dir}/build.${FUNCNAME} + fi +} + # Prepare ${install_dir}/boot/ make_boot() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch} + mkinitcpio \ + -c ./mkinitcpio.conf \ + -b ${work_dir}/root-image \ + -k /boot/vmlinuz26 \ + -g ${work_dir}/iso/${install_dir}/boot/${arch}/libreiso.img cp ${work_dir}/root-image/boot/vmlinuz26 ${work_dir}/iso/${install_dir}/boot/${arch} - mkinitcpio -c ./mkinitcpio.conf -b ${work_dir}/root-image -k $(get_linux_ver) -g ${work_dir}/iso/${install_dir}/boot/${arch}/libreiso.img : > ${work_dir}/build.${FUNCNAME} fi } @@ -89,6 +95,7 @@ fi make_basefs make_customize_root_image +make_setup_mkinitcpio make_boot make_syslinux make_isolinux |