summaryrefslogtreecommitdiffstats
path: root/openembedded/packages/module-init-tools/files/modutils_extension
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-08-31 10:45:47 +0000
committerRichard Purdie <richard@openedhand.com>2005-08-31 10:45:47 +0000
commit4b46c1f6e891b1ddd5968536440b888661fade3e (patch)
treee0ba2c1f56f61b868bf746da5c4feabb25b800b2 /openembedded/packages/module-init-tools/files/modutils_extension
downloadpoky-4b46c1f6e891b1ddd5968536440b888661fade3e.tar.gz
Initial population
git-svn-id: https://svn.o-hand.com/repos/poky@1 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/module-init-tools/files/modutils_extension')
-rw-r--r--openembedded/packages/module-init-tools/files/modutils_extension55
1 files changed, 55 insertions, 0 deletions
diff --git a/openembedded/packages/module-init-tools/files/modutils_extension b/openembedded/packages/module-init-tools/files/modutils_extension
new file mode 100644
index 0000000000..fd84ca2550
--- /dev/null
+++ b/openembedded/packages/module-init-tools/files/modutils_extension
@@ -0,0 +1,55 @@
1--- module-init-tools-3.0-pre10.orig/depmod.c
2+++ module-init-tools-3.0-pre10/depmod.c
3@@ -217,13 +217,13 @@
4 {
5 char *sep;
6 char pathname[strlen(argv[0])+1];
7- char oldname[strlen("depmod") + strlen(argv[0]) + sizeof(".old")];
8+ char oldname[strlen("depmod") + strlen(argv[0]) + sizeof(".24")];
9
10 memset(pathname, 0, strlen(argv[0])+1);
11 sep = strrchr(argv[0], '/');
12 if (sep)
13 memcpy(pathname, argv[0], sep - argv[0]+1);
14- sprintf(oldname, "%s%s.old", pathname, "depmod");
15+ sprintf(oldname, "%s%s.24", pathname, "depmod");
16
17 /* Recursion detection: we need an env var since we can't
18 change argv[0] (as older modutils uses it to determine
19--- module-init-tools-3.0-pre10.orig/backwards_compat.c
20+++ module-init-tools-3.0-pre10/backwards_compat.c
21@@ -21,13 +21,13 @@
22 pid_t pid;
23 char ascii_pid[32];
24 char pathname[strlen(argv[0])+1];
25- char oldname[strlen(progname) + strlen(argv[0]) + sizeof(".old")];
26+ char oldname[strlen(progname) + strlen(argv[0]) + sizeof(".24")];
27
28 memset(pathname, 0, strlen(argv[0])+1);
29 sep = strrchr(argv[0], '/');
30 if (sep)
31 memcpy(pathname, argv[0], sep - argv[0]+1);
32- sprintf(oldname, "%s%s.old", pathname, progname);
33+ sprintf(oldname, "%s%s.24", pathname, progname);
34
35 /* Recursion detection: we need an env var since we can't
36 change argv[0] (as older modutils uses it to determine
37--- module-init-tools-3.0-pre10.orig/generate-modprobe.conf
38+++ module-init-tools-3.0-pre10/generate-modprobe.conf
39@@ -26,12 +26,12 @@
40 cp $TESTING_MODPROBE_CONF $MODPROBECONF
41 elif [ "$STDIN" = "1" ]; then
42 cat > $MODPROBECONF
43-elif [ -x /sbin/modprobe.old ]; then
44+elif [ -x /sbin/modprobe.24 ]; then
45 # In sbin.
46- /sbin/modprobe.old -c > $MODPROBECONF
47-elif modprobe.old -c >/dev/null 2>&1; then
48+ /sbin/modprobe.24 -c > $MODPROBECONF
49+elif modprobe.24 -c >/dev/null 2>&1; then
50 # Somewhere in path.
51- modprobe.old -c > $MODPROBECONF
52+ modprobe.24 -c > $MODPROBECONF
53 elif /sbin/modprobe -V 2>/dev/null | grep -q 'modprobe version'; then
54 # Running /sbin/modprobe gives old version.
55 /sbin/modprobe -c > $MODPROBECONF