summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2003-07-12 18:56:15 +0000
committerMartin Schlemmer <azarah@gentoo.org>2003-07-12 18:56:15 +0000
commitedf92b987a280e7e31a69165919eff9aae350917 (patch)
tree418524558471176d04c35a38f07a541fc5a76994 /sys-apps/module-init-tools/files
parentInclude of config file fixups (diff)
downloadgentoo-2-edf92b987a280e7e31a69165919eff9aae350917.tar.gz
gentoo-2-edf92b987a280e7e31a69165919eff9aae350917.tar.bz2
gentoo-2-edf92b987a280e7e31a69165919eff9aae350917.zip
Include of config file fixups
Diffstat (limited to 'sys-apps/module-init-tools/files')
-rw-r--r--sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12-r12
-rw-r--r--sys-apps/module-init-tools/files/module-init-tools-0.9.12-includes-should-override.patch13
2 files changed, 15 insertions, 0 deletions
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12-r1 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12-r1
new file mode 100644
index 000000000000..da7deba7e67b
--- /dev/null
+++ b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12-r1
@@ -0,0 +1,2 @@
+MD5 d61517a904d005fd83c954dd7fe49f27 module-init-tools-0.9.12.tar.bz2 112896
+MD5 2c0cca3ef6330a187c6ef4fe41ecaa4d modutils-2.4.25.tar.bz2 220530
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.12-includes-should-override.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.12-includes-should-override.patch
new file mode 100644
index 000000000000..44947b306bec
--- /dev/null
+++ b/sys-apps/module-init-tools/files/module-init-tools-0.9.12-includes-should-override.patch
@@ -0,0 +1,13 @@
+--- module-init-tools-0.9.12/modprobe.c.orig 2003-07-12 20:00:52.000000000 +0200
++++ module-init-tools-0.9.12/modprobe.c 2003-07-12 20:28:04.000000000 +0200
+@@ -1015,7 +1015,9 @@ static char *read_config(const char *fil
+ newresult = read_config(newfilename, 1, name,
+ dump_only, removing,
+ options, commands);
+- if (!result)
++ /* Files included override aliases, etc that was
++ * already set ... */
++ if (newresult)
+ result = newresult;
+ }
+ } else if (strcmp(cmd, "options") == 0) {