[PATCH 1/3] Rename /etc/modprobe.d/anaconda to /etc/modprobe.d/anaconda.conf

[Chris Lumens <clumens@xxxxxxxxxx>]

The kernel tells me that all module config files have to end with .conf in
the future or they'll be ignored.  We had better rename it, then.
---
 loader/modules.c |    6 +++---
 yuminstall.py    |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/loader/modules.c b/loader/modules.c
index 705a3eb..bddda2b 100644
--- a/loader/modules.c
+++ b/loader/modules.c
@@ -101,7 +101,7 @@ void mlAddBlacklist(char *module) {
     blacklists = realloc(blacklists, sizeof(*blacklists) * (numblacklists + 1));
     blacklists[numblacklists] = strdup(module);
     numblacklists++;
-    writeModulesConf("/etc/modprobe.d/anaconda");
+    writeModulesConf("/etc/modprobe.d/anaconda.conf");
 }
 
 static void addOption(const char *module, const char *option) {
@@ -225,7 +225,7 @@ static int doLoadModule(const char *module, char ** args) {
             for (i = 0; args[i] ; i++) {
                 addOption(module, args[i]);
             }
-            writeModulesConf("/etc/modprobe.d/anaconda");
+            writeModulesConf("/etc/modprobe.d/anaconda.conf");
         }
         rc = execv("/sbin/modprobe", argv);
         _exit(rc);
@@ -252,7 +252,7 @@ void mlRemoveBlacklist(char *module) {
 void mlInitModuleConfig() {
     readModuleOpts();
     readBlacklist();
-    writeModulesConf("/etc/modprobe.d/anaconda");
+    writeModulesConf("/etc/modprobe.d/anaconda.conf");
 }
 
 /* load a module with a given list of arguments */
diff --git a/yuminstall.py b/yuminstall.py
index dd272bf..af6963d 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -1492,9 +1492,9 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon
         if not upgrade:
             anaconda.id.storage.fsset.write(anaconda.rootPath)
             # rootpath mode doesn't have this file around
-            if os.access("/etc/modprobe.d/anaconda", os.R_OK):
-                shutil.copyfile("/etc/modprobe.d/anaconda", 
-                                anaconda.rootPath + "/etc/modprobe.d/anaconda")
+            if os.access("/etc/modprobe.d/anaconda".conf, os.R_OK):
+                shutil.copyfile("/etc/modprobe.d/anaconda.conf", 
+                                anaconda.rootPath + "/etc/modprobe.d/anaconda.conf")
             anaconda.id.network.write(instPath=anaconda.rootPath, anaconda=anaconda)
             anaconda.id.storage.write(anaconda.rootPath)
             if not anaconda.id.isHeadless:
-- 
1.6.1.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list