Base: Add support for repository configuration in /usr

This enables shipping packaged repositories and variables in /usr, freeing up /etc for exclusively user-added repository configuration.
rpm-software-management · Sep 11, 2023 · be5b169 · be5b169
1 parent 88d747e
commit be5b169
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/dnf5.spec b/dnf5.spec
@@ -303,6 +303,8 @@ Package management library.
 %dir %{_datadir}/dnf5/libdnf.conf.d
 %dir %{_sysconfdir}/dnf/libdnf5.conf.d
 %dir %{_sysconfdir}/dnf/libdnf5-plugins
+%dir %{_datadir}/dnf5/repos.d
+%dir %{_datadir}/dnf5/vars.d
 %dir %{_libdir}/libdnf5
 %{_libdir}/libdnf5.so.1*
 %license lgpl-2.1.txt

diff --git a/dnf5/config/usr/share/dnf5/repos.d/.gitkeep b/dnf5/config/usr/share/dnf5/repos.d/.gitkeep
diff --git a/dnf5/config/usr/share/dnf5/vars.d/.gitkeep b/dnf5/config/usr/share/dnf5/vars.d/.gitkeep
diff --git a/include/libdnf5/conf/const.hpp b/include/libdnf5/conf/const.hpp
@@ -36,10 +36,11 @@ constexpr const char * CONF_DIRECTORY = "/etc/dnf/libdnf5.conf.d";
 
 constexpr const char * PLUGINS_CONF_DIR = "/etc/dnf/libdnf5-plugins";
 
-const std::vector<std::string> REPOSITORY_CONF_DIRS{"/etc/yum.repos.d", "/etc/distro.repos.d"};
+const std::vector<std::string> REPOSITORY_CONF_DIRS{
+    "/etc/yum.repos.d", "/etc/distro.repos.d", "/usr/share/dnf5/repos.d"};
 
 // More important varsdirs must be on the end of vector
-const std::vector<std::string> VARS_DIRS{"/etc/dnf/vars"};
+const std::vector<std::string> VARS_DIRS{"/usr/share/dnf5/vars.d", "/etc/dnf/vars"};
 
 const std::vector<std::string> GROUP_PACKAGE_TYPES{"mandatory", "default", "conditional"};
 const std::vector<std::string> INSTALLONLYPKGS{