X-Git-Url: http://git.onelab.eu/?p=bootstrapfs.git;a=blobdiff_plain;f=db-config.d%2F030-conf_files_node_update;fp=db-config.d%2F030-conf_files_node_update;h=9b970d4a3851ed48ae4b916442df132755e358e2;hp=b127d9b72953e36a1cc5b176af54603611bac554;hb=7c7004de1e05fdc36d63e5f4bf1076a0775431a5;hpb=7d79ede72d72cd4f0a4ac763fd8f5fdaf373674d

diff --git a/db-config.d/030-conf_files_node_update b/db-config.d/030-conf_files_node_update
index b127d9b..9b970d4 100644
--- a/db-config.d/030-conf_files_node_update
+++ b/db-config.d/030-conf_files_node_update
@@ -26,6 +26,21 @@ conf_files = [
           'preinstall_cmd' : '', 'postinstall_cmd' : '', 'error_cmd' : '',
           'ignore_cmd_errors' : False,
           'always_update' : False},
+        # starting with fedora 22 we need to tweak /etc/dnf/dnf.conf,
+        # not /etc/yum.conf
+        { 'enabled' : True,
+          'source' : 'yum/yum.php?path=dnf/dnf.conf',
+          'dest' : '/etc/dnf/dnf.conf',
+          'file_permissions' : '644', 'file_owner' : 'root', 'file_group' : 'root',
+          # ensure /etc/yum.repos.d is created as a symlink to /etc/yum.myplc.d
+          # since dnf under fedora22 does not seem to have a means to configure
+          # this location anymore
+          'preinstall_cmd' : '',
+          'postinstall_cmd' : 'bash -c "[ -d /etc/yum.repos.d ] || ln -sf /etc/yum.myplc.d /etc/yum.repos.d"',
+          'error_cmd' : '',
+          'ignore_cmd_errors' : False,
+          # here again, we need to make sure postinstall is always executed
+          'always_update' : True},
     
 # NodeUpdate
         { 'enabled' : True,