Verified Commit b5f04dba authored by nl6720's avatar nl6720
Browse files

Install mkinitcpio-archiso-hooks in airootfs instead of copying the hooks from host

parent e9303ca1
Pipeline #690 passed with stage
in 33 seconds
...@@ -112,6 +112,12 @@ To install archiso system-wide use the included **Makefile**: ...@@ -112,6 +112,12 @@ To install archiso system-wide use the included **Makefile**:
make install make install
Optionally install archiso's mkinitcpio hooks:
.. code:: bash
make install-initcpio
License License
======= =======
......
...@@ -56,11 +56,6 @@ make_custom_airootfs() { ...@@ -56,11 +56,6 @@ make_custom_airootfs() {
done < "${_airootfs}/etc/passwd" done < "${_airootfs}/etc/passwd"
fi fi
fi fi
mkdir -p -- "${work_dir}/airootfs/etc/initcpio/hooks"
mkdir -p -- "${work_dir}/airootfs/etc/initcpio/install"
cp /usr/lib/initcpio/hooks/archiso "${work_dir}/airootfs/etc/initcpio/hooks/"
cp /usr/lib/initcpio/install/archiso "${work_dir}/airootfs/etc/initcpio/install/"
} }
# Packages (airootfs) # Packages (airootfs)
......
...@@ -3,4 +3,5 @@ ...@@ -3,4 +3,5 @@
base base
linux linux
mkinitcpio mkinitcpio
mkinitcpio-archiso
syslinux syslinux
...@@ -86,17 +86,6 @@ make_custom_airootfs() { ...@@ -86,17 +86,6 @@ make_custom_airootfs() {
done < "${_airootfs}/etc/passwd" done < "${_airootfs}/etc/passwd"
fi fi
fi fi
local _hook
mkdir -p -- "${work_dir}/x86_64/airootfs/etc/initcpio/hooks"
mkdir -p -- "${work_dir}/x86_64/airootfs/etc/initcpio/install"
for _hook in archiso archiso_shutdown archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_loop_mnt; do
cp "/usr/lib/initcpio/hooks/${_hook}" "${work_dir}/x86_64/airootfs/etc/initcpio/hooks/"
cp "/usr/lib/initcpio/install/${_hook}" "${work_dir}/x86_64/airootfs/etc/initcpio/install/"
done
sed -i "s|/usr/lib/initcpio/|/etc/initcpio/|g" "${work_dir}/x86_64/airootfs/etc/initcpio/install/archiso_shutdown"
cp /usr/lib/initcpio/install/archiso_kms "${work_dir}/x86_64/airootfs/etc/initcpio/install/"
cp /usr/lib/initcpio/archiso_shutdown "${work_dir}/x86_64/airootfs/etc/initcpio/"
} }
# Packages (airootfs) # Packages (airootfs)
......
...@@ -48,6 +48,7 @@ mc ...@@ -48,6 +48,7 @@ mc
mdadm mdadm
memtest86+ memtest86+
mkinitcpio mkinitcpio
mkinitcpio-archiso
mkinitcpio-nfs-utils mkinitcpio-nfs-utils
mtools mtools
nano nano
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment