diff --git a/CHANGELOG b/CHANGELOG index 3cc5a28..bd22deb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,8 @@ - Remove unused CERTLIST variable in copy-trust-modifications - Fix syntax error in check_arg() function - Correct STDERR redirection in multiple functions + - Redirect errors in copy-trust-modifications script + - Use update-ca-certificates for systemd service 1.2 - Use md5sum values for anchors.txt to detect p11-kit changes - Added get_p11_label() function to get reliable label values - Added get_trust_values(), get_p11_trust(), and write_anchor() diff --git a/copy-trust-modifications b/copy-trust-modifications index 313e939..46b465c 100644 --- a/copy-trust-modifications +++ b/copy-trust-modifications @@ -19,9 +19,12 @@ TEMPDIR=`mktemp -d` "${TEMPDIR}" # Create a list of anchors that were not present or have been modified -"${MD5SUM}" "${ANCHORDIR}"/*.pem > "${TEMPDIR}/anchors.md5sums" -diff -au "${ANCHORLIST}" "${TEMPDIR}/anchors.md5sums" > "${TEMPDIR}/diff" -grep "^+[a-z,0-9]" "${TEMPDIR}/diff" | cut -d " " -f 3 > "${TEMPDIR}/certlist" +"${MD5SUM}" "${ANCHORDIR}"/*.pem \ + 2> /dev/null > "${TEMPDIR}/anchors.md5sums" +diff -au "${ANCHORLIST}" "${TEMPDIR}/anchors.md5sums" \ + 2> /dev/null > "${TEMPDIR}/diff" +grep "^+[a-z,0-9]" "${TEMPDIR}/diff" | cut -d " " -f 3 \ + 2> /dev/null > "${TEMPDIR}/certlist" echo -e "\nThe following certificates have local modifications:\n" diff --git a/systemd/update-pki.service b/systemd/update-pki.service index 636e2e9..8a21a86 100644 --- a/systemd/update-pki.service +++ b/systemd/update-pki.service @@ -9,5 +9,5 @@ Wants=network-online.target [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/usr/sbin/make-ca -g +ExecStart=/usr/bin/update-ca-certificates