From 735125f8378a60c9d93e51474ca4b934516cea1d Mon Sep 17 00:00:00 2001 From: Esteban Carnevale Date: Sun, 10 Mar 2013 21:13:38 -0300 Subject: Relative path to files inside initcpio directory --- configs/baseline/build.sh | 4 ++-- configs/releng/build.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index df105e5..1519230 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -27,8 +27,8 @@ make_basefs() { # Copy mkinitcpio parabolaiso hooks and build initramfs (root-image) make_setup_mkinitcpio() { - cp /usr/lib/initcpio/hooks/parabolaiso ${work_dir}/root-image/usr/lib/initcpio/hooks - cp /usr/lib/initcpio/install/parabolaiso ${work_dir}/root-image/usr/lib/initcpio/install + cp ../../parabolaiso/initcpio/hooks/parabolaiso ${work_dir}/root-image/usr/lib/initcpio/hooks + cp ../../parabolaiso/initcpio/install/parabolaiso ${work_dir}/root-image/usr/lib/initcpio/install cp ${script_path}/mkinitcpio.conf ${work_dir}/root-image/etc/mkinitcpio-parabolaiso.conf ../../parabolaiso/mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux-libre -g /boot/parabolaiso.img' run } diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 95b768a..ecc68e2 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -66,11 +66,11 @@ make_packages() { make_setup_mkinitcpio() { local _hook for _hook in parabolaiso parabolaiso_shutdown parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_loop_mnt; do - cp /usr/lib/initcpio/hooks/${_hook} ${work_dir}/${arch}/root-image/usr/lib/initcpio/hooks - cp /usr/lib/initcpio/install/${_hook} ${work_dir}/${arch}/root-image/usr/lib/initcpio/install + cp ../../parabolaiso/initcpio/hooks/${_hook} ${work_dir}/${arch}/root-image/usr/lib/initcpio/hooks + cp ../../parabolaiso/initcpio/install/${_hook} ${work_dir}/${arch}/root-image/usr/lib/initcpio/install done - cp /usr/lib/initcpio/install/parabolaiso_kms ${work_dir}/${arch}/root-image/usr/lib/initcpio/install - cp /usr/lib/initcpio/parabolaiso_shutdown ${work_dir}/${arch}/root-image/usr/lib/initcpio + cp ../../parabolaiso/initcpio/install/parabolaiso_kms ${work_dir}/${arch}/root-image/usr/lib/initcpio/install + cp ../../parabolaiso/initcpio/script/parabolaiso_shutdown ${work_dir}/${arch}/root-image/usr/lib/initcpio cp ${script_path}/mkinitcpio.conf ${work_dir}/${arch}/root-image/etc/mkinitcpio-parabolaiso.conf setarch ${arch} ../../parabolaiso/mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux-libre -g /boot/parabolaiso.img' run } -- cgit v1.2.3