From 1f66a737de00016f4d78ab340cccbca4e8ec430c Mon Sep 17 00:00:00 2001
From: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Date: Sun, 4 Mar 2012 20:58:58 -0300
Subject: [archiso] /lib/initcpio -> /usr/lib/initcpio

Needs mkinitpcio >= 0.8.4

Next changes will be for mdadm and mkinitcpio-nfs-utils:
* /lib/initcpio/udev/11-dm-initramfs.rules
* /lib/initcpio/ipconfig , /lib/initcpio/nfsmount

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
---
 configs/baseline/build.sh |  4 ++--
 configs/releng/build.sh   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'configs')

diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index 36cab15..1f2251d 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -22,8 +22,8 @@ make_basefs() {
 # 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
+        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
         : > ${work_dir}/build.${FUNCNAME}
    fi
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 4967863..42836a9 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -29,12 +29,12 @@ make_setup_mkinitcpio() {
    if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
         local _hook
         for _hook in archiso archiso_shutdown archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_loop_mnt; do
-            cp /lib/initcpio/hooks/${_hook} ${work_dir}/root-image/lib/initcpio/hooks
-            cp /lib/initcpio/install/${_hook} ${work_dir}/root-image/lib/initcpio/install
+            cp /usr/lib/initcpio/hooks/${_hook} ${work_dir}/root-image/usr/lib/initcpio/hooks
+            cp /usr/lib/initcpio/install/${_hook} ${work_dir}/root-image/usr/lib/initcpio/install
         done
-        cp /lib/initcpio/install/archiso_kms ${work_dir}/root-image/lib/initcpio/install
-        cp /lib/initcpio/archiso_shutdown ${work_dir}/root-image/lib/initcpio
-        cp /lib/initcpio/archiso_pxe_nbd ${work_dir}/root-image/lib/initcpio
+        cp /usr/lib/initcpio/install/archiso_kms ${work_dir}/root-image/usr/lib/initcpio/install
+        cp /usr/lib/initcpio/archiso_shutdown ${work_dir}/root-image/usr/lib/initcpio
+        cp /usr/lib/initcpio/archiso_pxe_nbd ${work_dir}/root-image/usr/lib/initcpio
         cp ${script_path}/mkinitcpio.conf ${work_dir}/root-image/etc/mkinitcpio-archiso.conf
         : > ${work_dir}/build.${FUNCNAME}
    fi
-- 
cgit v1.2.2