summaryrefslogtreecommitdiff
path: root/configs/baseline
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-11-28 10:35:05 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-11-28 10:35:05 -0300
commit40965461a4a730881a153432e66521734b1b965c (patch)
tree094cd480e1fae939d70482566ea659df1eceb0b5 /configs/baseline
parent334db092b52e78a68d012ce2fa453ec243943c64 (diff)
downloadarchiso32-40965461a4a730881a153432e66521734b1b965c.tar.xz
[configs/*] chroot to root-image for initramfs build
Avoid issues with -b BASEDIR (*). We became independent of the mkinitcpio version of the build environment. (*) For example of a recent issue: http://mailman.archlinux.org/pipermail/arch-projects/2011-November/002202.html http://mailman.archlinux.org/pipermail/arch-projects/2011-November/002205.html Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Diffstat (limited to 'configs/baseline')
-rwxr-xr-xconfigs/baseline/build.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index ab7a88e..36cab15 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -24,6 +24,7 @@ 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
+ cp ${script_path}/mkinitcpio.conf ${work_dir}/root-image/etc/mkinitcpio-archiso.conf
: > ${work_dir}/build.${FUNCNAME}
fi
}
@@ -32,11 +33,8 @@ make_setup_mkinitcpio() {
make_boot() {
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch}
- mkinitcpio \
- -c ${script_path}/mkinitcpio.conf \
- -b ${work_dir}/root-image \
- -k /boot/vmlinuz-linux \
- -g ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img
+ mkarchroot -n -r "mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img" ${work_dir}/root-image
+ cp ${work_dir}/root-image/boot/archiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img
cp ${work_dir}/root-image/boot/vmlinuz-linux ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
: > ${work_dir}/build.${FUNCNAME}
fi