keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

countme: Force disable Count Me logic in DNF

Browse Source 
Make sure that we do not use the internal Count Me logic in DNF in
rpm-ostree as we have our own external implementation that is aware of
the different behavior regarding repo handling.

See also the discussions in:
  - https://github.com/rpm-software-management/libdnf/issues/1174
  - https://github.com/rpm-software-management/libdnf/issues/1068
  - https://github.com/coreos/rpm-ostree/pull/2671

Also remove the corresponding note in the docs which not needed anymore.
This commit is contained in:
Timothée Ravier 2021-04-13 13:03:41 +02:00 committed by Colin Walters
parent 5d199a60f7
commit 19e40a8708
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docs/countme.md
View File

@ -32,19 +32,4 @@ mask the corresponding unit as a precaution:
$ systemctl mask --now rpm-ostree-countme.timer $ systemctl mask --now rpm-ostree-countme.timer
``` ```
If you have packages layered on top of the base image from an RPM repository,
then you will have to make sure that the `countme` option is disabled there
until we fix [this issue in libdnf][libdnfissue]:
```
$ sed -i 's/countme=1/countme=0/g' /etc/yum.repos.d/*.repo
```
Note that once you do that, those repository configuration files will be
considered as locally modified by ostree which will hence ignore any other
changes to the defaults that may happen via a future update. You can always
restore the original configuration or propagate updates from the default
configuration available in `/usr/etc/yum.repos.d/*.repo`.
[countme]: https://fedoraproject.org/wiki/Changes/DNF_Better_Counting [countme]: https://fedoraproject.org/wiki/Changes/DNF_Better_Counting
[libdnfissue]: https://github.com/rpm-software-management/libdnf/issues/1174

3
src/libpriv/rpmostree-core.cxx
View File

@ -396,6 +396,9 @@ rpmostree_context_new_client (OstreeRepo *repo,
/* we don't need any plugins */ /* we don't need any plugins */
dnf_context_set_plugins_dir (self->dnfctx, NULL); dnf_context_set_plugins_dir (self->dnfctx, NULL);
/* Force disable internal libdnf Count Me logic */
dnf_conf_add_setopt("*.countme", DNF_CONF_COMMANDLINE, "false", NULL);
/* Hack until libdnf+librepo know how to better negotaiate zchunk. /* Hack until libdnf+librepo know how to better negotaiate zchunk.
* see also the bits in configure.ac that define HAVE_ZCHUNK * see also the bits in configure.ac that define HAVE_ZCHUNK
**/ **/