1 --- module-init-tools-3.0-pre10.orig/depmod.c
2 +++ module-init-tools-3.0-pre10/depmod.c
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")];
10 memset(pathname, 0, strlen(argv[0])+1);
11 sep = strrchr(argv[0], '/');
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");
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
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")];
28 memset(pathname, 0, strlen(argv[0])+1);
29 sep = strrchr(argv[0], '/');
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);
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
40 cp $TESTING_MODPROBE_CONF $MODPROBECONF
41 elif [ "$STDIN" = "1" ]; then
43 -elif [ -x /sbin/modprobe.old ]; then
44 +elif [ -x /sbin/modprobe.24 ]; then
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
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