diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9387d4c006fe64d1c1ab65fe8cbdc1d0a9666a75..1f01f6f1dcca6765d6b67d4265635b8024b6b8ac 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,7 @@ Changed - Use mkinitcpio's ``add_udev_rule`` function to add udev rules instead of adding them as regular files. - Use full path to ``ash`` in runtime hook shebang. - Use ``/usr/bin/`` instead of ``/bin/`` as the target paths for binaries. +- Do not check for symlinks when adding files with install hooks, instead let mkinitcpio handle them. Removed ------- diff --git a/install/archiso_pxe_common b/install/archiso_pxe_common index 55a0692f447760d5585bf392c953b9bac421c3ad..68c36907ea10c5eee2bbcdba96e81b5f9a14e9b2 100644 --- a/install/archiso_pxe_common +++ b/install/archiso_pxe_common @@ -10,10 +10,8 @@ build() { add_binary /usr/lib/initcpio/ipconfig /usr/bin/ipconfig # Add hosts support files+dns - add_symlink /usr/lib/libnss_files.so.2 "$(readlink /usr/lib/libnss_files.so.2)" - add_binary "$(readlink -f /usr/lib/libnss_files.so.2)" - add_symlink /usr/lib/libnss_dns.so.2 "$(readlink /usr/lib/libnss_dns.so.2)" - add_binary "$(readlink -f /usr/lib/libnss_dns.so.2)" + add_binary /usr/lib/libnss_files.so.2 + add_binary /usr/lib/libnss_dns.so.2 add_dir /etc printf "hosts: files dns\n" >"$BUILDROOT/etc/nsswitch.conf" diff --git a/install/archiso_pxe_http b/install/archiso_pxe_http index afdde439bd6ccc98df0df7b6f2e9e1b9c912dbec..d6e77ae1ea92b9d118c37324b68bb8badff5ee0f 100644 --- a/install/archiso_pxe_http +++ b/install/archiso_pxe_http @@ -7,7 +7,7 @@ build() { add_binary curl - add_file "$(readlink -f /etc/ssl/certs/ca-certificates.crt)" /etc/ssl/certs/ca-certificates.crt + add_file /etc/ssl/certs/ca-certificates.crt } help() {