diff options
| author | nl6720 <nl6720@gmail.com> | 2020-07-29 19:23:58 +0300 |
|---|---|---|
| committer | nl6720 <nl6720@gmail.com> | 2020-07-30 12:55:12 +0300 |
| commit | b5f04dba2b45d4949cad0666d0df84637e10960f (patch) | |
| tree | ba7100ced3a02111ef0e58117a007f9ba346f460 | |
| parent | e9303ca175ecfe1d7ca23bbcacf8b7f3d2ae85c1 (diff) | |
| download | archiso-b5f04dba2b45d4949cad0666d0df84637e10960f.tar.gz archiso-b5f04dba2b45d4949cad0666d0df84637e10960f.tar.bz2 | |
Install mkinitcpio-archiso-hooks in airootfs instead of copying the hooks from host
| -rw-r--r-- | README.rst | 6 | ||||
| -rwxr-xr-x | configs/baseline/build.sh | 5 | ||||
| -rw-r--r-- | configs/baseline/packages.x86_64 | 1 | ||||
| -rwxr-xr-x | configs/releng/build.sh | 11 | ||||
| -rw-r--r-- | configs/releng/packages.x86_64 | 1 |
5 files changed, 8 insertions, 16 deletions
@@ -112,6 +112,12 @@ To install archiso system-wide use the included **Makefile**: make install +Optionally install archiso's mkinitcpio hooks: + + .. code:: bash + + make install-initcpio + License ======= diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 79cd34e..c0b1704 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -56,11 +56,6 @@ make_custom_airootfs() { done < "${_airootfs}/etc/passwd" 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) diff --git a/configs/baseline/packages.x86_64 b/configs/baseline/packages.x86_64 index 14fe5f0..fd753b4 100644 --- a/configs/baseline/packages.x86_64 +++ b/configs/baseline/packages.x86_64 @@ -3,4 +3,5 @@ base linux mkinitcpio +mkinitcpio-archiso syslinux diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 888c061..7f0eb67 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -86,17 +86,6 @@ make_custom_airootfs() { done < "${_airootfs}/etc/passwd" 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) diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 2c73b8e..f5e7e9f 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -48,6 +48,7 @@ mc mdadm memtest86+ mkinitcpio +mkinitcpio-archiso mkinitcpio-nfs-utils mtools nano |