An earlier change removed backcompat from modprobe only. Remove
backcompat from the other commands, and update the documentation
accordingly.
This means "make install" doesn't need modprobe.old and friends.
It should make it simpler to create distribution packages.
Signed-off-by: Alan Jenkins <alan-jenkins@xxxxxxxxxxxxxx>
---
Marco: I'm hoping this will let you use "make install", so you
don't have to work around the problem of patched manpages being
rebuilt in the "wrong" direectory.
diff --git a/Makefile.am b/Makefile.am
index c0f618e..e132049 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,13 +13,13 @@ insmod_static_LDFLAGS = -static
# We don't want the $(zlib_flags) here: that makes a dynamic executable
insmod_static_LDADD =
-EXTRA_insmod_SOURCES = backwards_compat.c
-EXTRA_lsmod_SOURCES = backwards_compat.c
+EXTRA_insmod_SOURCES =
+EXTRA_lsmod_SOURCES =
EXTRA_modprobe_SOURCES =
-EXTRA_rmmod_SOURCES = backwards_compat.c
-EXTRA_insmod_static_SOURCES = backwards_compat.c
+EXTRA_rmmod_SOURCES =
+EXTRA_insmod_static_SOURCES =
EXTRA_depmod_SOURCES = moduleops_core.c
-EXTRA_modinfo_SOURCES = backwards_compat.c
+EXTRA_modinfo_SOURCES =
MAN5 = modprobe.conf.5 modules.dep.5 depmod.conf.5
MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8
@@ -94,48 +94,3 @@ $(DIST_DIR)/module-init-tools-testsuite-$(VERSION).tar.gz:
rm /tmp/module-init-tools-$(VERSION)
release: check clean tarball
-
-moveold: check-for-sbin check-for-old move-old-targets
-
-check-for-sbin:
- if [ "`echo $(DESTDIR)$(sbindir) | tr -s / /`" = /sbin ]; then :; \
- else \
- echo moveold usually only makes sense when installing into /sbin; \
- exit 1; \
- fi
-
-check-for-old:
- if [ -f /sbin/lsmod.old ]; then \
- echo Someone already moved old versions. >&2; exit 1; \
- fi
-
-# Don't just move symlinks, reset them to point to xxx.old.
-# RedHat 8.0 doesn't ship with readlink by default. Use ls -l.
-# Also, make symlink from /bin to /sbin for lsmod (FHS compliant).
-move-old-targets:
- for f in lsmod modprobe rmmod depmod insmod modinfo; do \
- if [ -L /sbin/$$f ]; then \
- ln -sf `ls -l /sbin/$$f | sed 's/.* -> //'`.old /sbin/$$f; \
- fi; \
- mv /sbin/$$f /sbin/$$f.old; \
- if [ -f /usr/share/man/man8/$$f.8.gz ]; then \
- mv /usr/share/man/man8/$$f.8.gz \
- /usr/share/man/man8/$$f.old.8.gz; \
- elif [ -f /usr/share/man/man8/$$f.8.bz2 ]; then \
- mv /usr/share/man/man8/$$f.8.bz2 \
- /usr/share/man/man8/$$f.old.8.bz2; \
- else \
- mv /usr/share/man/man8/$$f.8 /usr/share/man/man8/$$f.old.8; \
- fi; \
- done
- for f in kallsyms ksyms; do \
- if [ -L /sbin/$$f ]; then \
- ln -sf `ls -l /sbin/$$f | sed 's/.* -> //'`.old /sbin/$$f; \
- fi; \
- done
- ln -s /sbin/lsmod.old /bin/lsmod.old
-
-# For installs in /usr/local/sbin
-links:
- for f in insmod modprobe rmmod depmod; do ln -s /sbin/$$f $(DESTDIR)$(sbindir)/$$f.old; done
- for f in lsmod; do ln -s /sbin/$$f $(DESTDIR)$(bindir)/$$f.old; done
diff --git a/backwards_compat.c b/backwards_compat.c
deleted file mode 100644
index 45320cf..0000000
--- a/backwards_compat.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Simple backwards compat code to exec old version */
-
-#ifndef CONFIG_NO_BACKWARDS_COMPAT
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <asm/unistd.h>
-
-extern long create_module(const char *, size_t);
-
-#include "testing.h"
-
-static void exec_old(const char *progname, char *argv[])
-{
- char *sep;
- pid_t pid;
- char ascii_pid[32];
- char pathname[strlen(argv[0])+1];
- char oldname[strlen(progname) + strlen(argv[0]) + sizeof(".old")];
-
- memset(pathname, 0, strlen(argv[0])+1);
- sep = strrchr(argv[0], '/');
- if (sep)
- memcpy(pathname, argv[0], sep - argv[0]+1);
- sprintf(oldname, "%s%s.old", pathname, progname);
-
- /* Recursion detection: we need an env var since we can't
- change argv[0] (as older modutils uses it to determine
- behavior). We *can* recurse in the case of old-style
- pre-install etc. commands, so make sure pid is exactly the
- same. */
- pid = getpid();
- snprintf(ascii_pid, sizeof(ascii_pid), "%lu", (unsigned long)pid);
- if (strcmp(getenv("MODULE_RECURSE") ?: "", ascii_pid) == 0) {
- fprintf(stderr, "WARNING: %s: I am not the old version!\n",
- oldname);
- return;
- }
- setenv("MODULE_RECURSE", ascii_pid, 1);
-
- execvp(oldname, argv);
- fprintf(stderr,
- "Kernel requires old %s, but couldn't run %s: %s\n",
- progname, oldname, strerror(errno));
- exit(2);
-}
-
-static void try_old_version(const char *progname, char *argv[])
-{
- errno = 0;
- if (create_module(NULL, 0) >= 0 /* Uh oh, what have I just done? */
- || errno != ENOSYS)
- exec_old(progname, argv);
-}
-#else /* CONFIG_NO_BACKWARDS_COMPAT */
-static inline void try_old_version(const char *progname, char *argv[])
-{
-}
-#endif /* !CONFIG_NO_BACKWARDS_COMPAT */
diff --git a/depmod.c b/depmod.c
index a2bf055..d740c1b 100644
--- a/depmod.c
+++ b/depmod.c
@@ -214,33 +214,6 @@ static int old_module_version(const char *version)
return 1;
}
-static void exec_old_depmod(char *argv[])
-{
- char *sep;
- char pathname[strlen(argv[0])+1];
- char oldname[strlen("depmod") + strlen(argv[0]) + sizeof(".old")];
-
- memset(pathname, 0, strlen(argv[0])+1);
- sep = strrchr(argv[0], '/');
- if (sep)
- memcpy(pathname, argv[0], sep - argv[0]+1);
- sprintf(oldname, "%s%s.old", pathname, "depmod");
-
- /* Recursion detection: we need an env var since we can't
- change argv[0] (as older modutils uses it to determine
- behavior). */
- if (getenv("MODULE_RECURSE"))
- return;
- setenv("MODULE_RECURSE", "y", 0);
-
- execvp(oldname, argv);
- fprintf(stderr,
- "Version requires old depmod, but couldn't run %s: %s\n",
- oldname, strerror(errno));
- exit(2);
-}
-
-
static void print_usage(const char *name)
{
fprintf(stderr,
@@ -1269,9 +1242,12 @@ int main(int argc, char *argv[])
version = NOFAIL(strdup(buf.release));
}
- /* Run old version if required. */
- if (old_module_version(version))
- exec_old_depmod(argv);
+ /* Check for old version. */
+ if (old_module_version(version)) {
+ fprintf(stderr, "Kernel version %s requires old depmod\n",
+ version);
+ exit(2);
+ }
if (badopt) {
fprintf(stderr, "%s: malformed/unrecognized option '%s'\n",
diff --git a/doc/depmod.sgml b/doc/depmod.sgml
index 48899a7..198fc03 100644
--- a/doc/depmod.sgml
+++ b/doc/depmod.sgml
@@ -202,11 +202,8 @@
<para>
This version of <command>depmod</command> is for kernels
- <literal>2.5.48</literal> and above. If it detects a kernel
- with support for old-style modules, or the version specified is
- before <literal>2.5.48</literal>, it will attempt to run
- <command>depmod.old</command> in its place, so it is completely
- transparent to the user.
+ <literal>2.5.48</literal> and above. There is no support
+ for old-style modules.
</para>
</refsect1>
<refsect1>
diff --git a/doc/insmod.sgml b/doc/insmod.sgml
index 4c653b4..b991ffb 100644
--- a/doc/insmod.sgml
+++ b/doc/insmod.sgml
@@ -54,11 +54,9 @@
<title>BACKWARDS COMPATIBILITY</title>
<para>This version of <command>insmod</command> is for kernels
- <literal>2.5.48</literal> and above. If it detects a kernel
- with support for old-style modules (for which much of the work
- was done in userspace), it will attempt to run
- <command>insmod.old</command> in its place, so it is
- completely transparent to the user.</para>
+ <literal>2.5.48</literal> and above. There is no support for
+ old-style modules (for which much of the work was done in
+ userspace).</para>
</refsect1>
<refsect1>
<title>COPYRIGHT</title>
diff --git a/doc/lsmod.sgml b/doc/lsmod.sgml
index ffaf964..4b4d574 100644
--- a/doc/lsmod.sgml
+++ b/doc/lsmod.sgml
@@ -45,10 +45,9 @@
<title>BACKWARDS COMPATIBILITY</title>
<para>This version of <command>lsmod</command> is for kernels
- <literal>2.5.48</literal> and above. If it detects a kernel
- with support for old-style modules, it will attempt to run
- <command>lsmod.old</command> in its place, so it is completely
- transparent to the user.</para>
+ <literal>2.5.48</literal> and above. There is no support for
+ old-style modules (for which much of the work was done in
+ userspace).
</refsect1>
<refsect1>
<title>COPYRIGHT</title>
diff --git a/doc/modinfo.sgml b/doc/modinfo.sgml
index bc1e4fa..4b9ae1c 100644
--- a/doc/modinfo.sgml
+++ b/doc/modinfo.sgml
@@ -140,21 +140,14 @@
<title>BACKWARDS COMPATIBILITY</title>
<para>This version of <command>modinfo</command> is for kernel
- modules <literal>2.5.48</literal> and above. If it detects a
- kernel with support for old-style modules, it will attempt to
- run <command>modprobe.old</command> in its place, so it is
- completely transparent to the user.</para>
+ modules <literal>2.5.48</literal> and above. There is no
+ support for old-style modules.
<para>Note that the output of this version of
<command>modinfo</command> is simpler and more regular than
the older version: scripts attempting to use the default
output may get confused with complex fields.
</para>
-
- <para>You can force the new <command>modinfo</command> to always
- be used, by setting the <literal>NEW_MODINFO</literal>
- environment variable.
- </para>
</refsect1>
<refsect1>
<title>COPYRIGHT</title>
diff --git a/doc/modprobe.conf.sgml b/doc/modprobe.conf.sgml
index 67f41a0..2eee2e2 100644
--- a/doc/modprobe.conf.sgml
+++ b/doc/modprobe.conf.sgml
@@ -196,8 +196,8 @@
<para>
There is a <command>generate_modprobe.conf</command> program
which should do a reasonable job of generating
- <filename>modprobe.conf</filename> from your current (2.4 or
- 2.2) modules setup.
+ <filename>modprobe.conf</filename> from old (2.4 or 2.2)
+ module setups.
</para>
<para>
Although the syntax is similar to the older
diff --git a/doc/modprobe.sgml b/doc/modprobe.sgml
index ba51550..be5c903 100644
--- a/doc/modprobe.sgml
+++ b/doc/modprobe.sgml
@@ -455,11 +455,9 @@
<para>
This version of <command>modprobe</command> is for kernels
- <literal>2.5.48</literal> and above. If it detects a kernel
- with support for old-style modules (for which much of the work
- was done in userspace), it will attempt to run
- <command>modprobe.old</command> in its place, so it is
- completely transparent to the user.
+ <literal>2.5.48</literal> and above. There is no support for
+ old-style modules (for which much of the work was done in
+ userspace).
</para>
</refsect1>
<refsect1>
diff --git a/doc/rmmod.sgml b/doc/rmmod.sgml
index 676b2d4..f04e3d1 100644
--- a/doc/rmmod.sgml
+++ b/doc/rmmod.sgml
@@ -119,11 +119,9 @@
<para>
This version of <command>rmmod</command> is for kernels
- <literal>2.5.48</literal> and above. If it detects a kernel
- with support for old-style modules (for which much of the work
- was done in userspace), it will attempt to run
- <command>rmmod.old</command> in its place, so it is completely
- transparent to the user.
+ <literal>2.5.48</literal> and above. There is no support for
+ old-style modules (for which much of the work was done in
+ userspace).
</para>
</refsect1>
<refsect1>
diff --git a/insmod.c b/insmod.c
index 3d6783d..84b66d0 100644
--- a/insmod.c
+++ b/insmod.c
@@ -30,7 +30,6 @@
#include "util.h"
#include "testing.h"
-#include "backwards_compat.c"
extern long init_module(void *, unsigned long, const char *);
@@ -120,10 +119,6 @@ int main(int argc, char *argv[])
p++;
else
p=argv[0];
- if (strstr(p, "insmod.static"))
- try_old_version("insmod.static", argv);
- else
- try_old_version("insmod", argv);
if (argv[1] && (streq(argv[1], "--version") || streq(argv[1], "-V"))) {
puts(PACKAGE " version " VERSION);
diff --git a/install-with-care b/install-with-care
index 499e410..4ae7c9b 100755
--- a/install-with-care
+++ b/install-with-care
@@ -8,8 +8,17 @@ eval DEST=\$$#
case `echo $DEST | tr -s / /` in
/sbin/insmod.static) ;;# This didn't exist before, OK.
/sbin/insmod|/sbin/lsmod|/sbin/modprobe|/sbin/rmmod|/sbin/depmod)
- if [ -f $DEST ] && [ ! -f $DEST.old ]; then
- echo Refusing to install $DEST, move old utils first. >&2
+ if [ -f $DEST ] && [ -f $DEST.old ]; then
+ echo Refusing to install $DEST, remove $DEST.old first. >&2
+ echo Note: $DEST requires kernel version 2.5.48 or above.
+ if [ $DEST = /sbin/modprobe ]; then
+cat << EOF >&2
+
+Note: generate-modprobe.conf requires /sbin/modprobe.old.
+(i.e. if you need to run it, do so before removing modprobe.old).
+
+EOF
+ fi
exit 1
fi
;;
diff --git a/lsmod.c b/lsmod.c
index 489078e..1fd2ec4 100644
--- a/lsmod.c
+++ b/lsmod.c
@@ -28,7 +28,6 @@
#include <asm/unistd.h>
#include "testing.h"
-#include "backwards_compat.c"
static void print_usage(const char *progname)
{
@@ -41,8 +40,6 @@ int main(int argc, char *argv[])
char line[4096];
FILE *file;
- try_old_version("lsmod", argv);
-
if (argc != 1)
print_usage("lsmod");
diff --git a/modinfo.c b/modinfo.c
index 8ebd720..2208b19 100644
--- a/modinfo.c
+++ b/modinfo.c
@@ -15,7 +15,7 @@
#include "util.h"
#include "zlibsupport.h"
-#include "backwards_compat.c"
+#include "testing.h"
#ifndef MODULE_DIR
#define MODULE_DIR "/lib/modules"
@@ -356,9 +356,6 @@ int main(int argc, char *argv[])
int opt, ret = 0;
char *basedir = "";
- if (!getenv("NEW_MODINFO"))
- try_old_version("modinfo", argv);
-
endian_test.s = 1;
if (endian_test.c[1] == 1) my_endian = ELFDATA2MSB;
else if (endian_test.c[0] == 1) my_endian = ELFDATA2LSB;
diff --git a/rmmod.c b/rmmod.c
index 7ef2e31..f317ed9 100644
--- a/rmmod.c
+++ b/rmmod.c
@@ -30,7 +30,6 @@
#include "util.h"
#include "logging.h"
#include "testing.h"
-#include "backwards_compat.c"
extern long delete_module(const char *, unsigned int);
@@ -166,8 +165,6 @@ int main(int argc, char *argv[])
int i, opt, all = 0;
int ret, err;
- try_old_version("rmmod", argv);
-
while ((opt = getopt_long(argc, argv,
"afh?swvV", options, NULL)) != EOF) {
switch (opt) {
diff --git a/tests/test-depmod/disabled_01backcompat.sh b/tests/test-depmod/disabled_01backcompat.sh
deleted file mode 100755
index d609cb8..0000000
--- a/tests/test-depmod/disabled_01backcompat.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-
-# Backwards compat using explicit version number
-[ "`depmod 1.5.48 2>&1`" = "Version requires old depmod, but couldn't run depmod.old: No such file or directory" ]
-[ "`depmod 2.0.1 2>&1`" = "Version requires old depmod, but couldn't run depmod.old: No such file or directory" ]
-[ "`depmod 2.4.20 2>&1`" = "Version requires old depmod, but couldn't run depmod.old: No such file or directory" ]
-[ "`depmod 2.4.49 2>&1`" = "Version requires old depmod, but couldn't run depmod.old: No such file or directory" ]
-
-# Implicit version number.
-[ "`MODTEST_UNAME=1.5.48 depmod 2>&1`" = "Version requires old depmod, but couldn't run depmod.old: No such file or directory" ]
-[ "`MODTEST_UNAME=2.0.1 depmod 2>&1`" = "Version requires old depmod, but couldn't run depmod.old: No such file or directory" ]
-[ "`MODTEST_UNAME=2.4.20 depmod 2>&1`" = "Version requires old depmod, but couldn't run depmod.old: No such file or directory" ]
-[ "`MODTEST_UNAME=2.4.49 depmod 2>&1`" = "Version requires old depmod, but couldn't run depmod.old: No such file or directory" ]
-
-# Create one for it to find, put it in the path.
-echo '#! /bin/sh' > tests/tmp/depmod.old
-echo 'echo -n DEPMOD.OLD' >> tests/tmp/depmod.old
-echo "for f; do echo -n \ \'\$f\'; done" >> tests/tmp/depmod.old
-chmod a+x tests/tmp/depmod.old
-PATH=`pwd`/tests/tmp:$PATH
-
-MODTEST_UNAME=2.4.20
-
-# If explicit path given, shouldn't search path.
-[ "`depmod 2>&1`" = "Version requires old depmod, but couldn't run depmod.old: No such file or directory" ]
-
-# No args expected
-[ "`depmod 2>&1`" = "DEPMOD.OLD" ]
-
-# Args intact
-[ "`depmod --some-wierd-option foo 2>&1`" = "DEPMOD.OLD '--some-wierd-option' 'foo'" ]
-
-# Don't treat arg after -C as version number.
-[ "`depmod -C 2.6.1 2>&1`" = "DEPMOD.OLD '-C' '2.6.1'" ]
-
-# This should skip the arg after -C, and NOT invoke backwards compat code.
-MODTEST_OVERRIDE1=/lib/modules/2.6.1-kexec
-MODTEST_OVERRIDE_WITH1=DOES_NOT_EXIST
-export MODTEST_OVERRIDE1 MODTEST_OVERRIDE_WITH1
-
-[ "`depmod -ae -C /dev/null 2.6.1-kexec 2>&1`" = "WARNING: Couldn't open directory /lib/modules/2.6.1-kexec: No such file or directory
-FATAL: Could not open /lib/modules/2.6.1-kexec/modules.dep.temp for writing: No such file or directory" ]
diff --git a/tests/test-insmod/disabled01backcompat.sh b/tests/test-insmod/disabled01backcompat.sh
deleted file mode 100755
index a6c80a9..0000000
--- a/tests/test-insmod/disabled01backcompat.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-
-MODTEST_DO_CREATE_MODULE=1
-export MODTEST_DO_CREATE_MODULE
-
-# Should fail to run (sys_create_module succeeds), not find insmod.old.
-[ "`insmod 2>&1`" = "Kernel requires old insmod, but couldn't run ./insmod.old: No such file or directory" ]
-
-# Create one for it to find, put it in the path
-echo '#! /bin/sh' > tests/tmp/insmod.old
-echo 'echo -n INSMOD.OLD' >> tests/tmp/insmod.old
-echo "for f; do echo -n \ \'\$f\'; done" >> tests/tmp/insmod.old
-chmod a+x tests/tmp/insmod.old
-PATH=`pwd`/tests/tmp:$PATH
-
-# If explicit path given, shouldn't search path.
-[ "`insmod 2>&1`" = "Kernel requires old insmod, but couldn't run ./insmod.old: No such file or directory" ]
-
-# No args expected
-[ "`insmod`" = "INSMOD.OLD" ]
-
-# Args intact
-[ "`insmod --some-wierd-option foo`" = "INSMOD.OLD '--some-wierd-option' 'foo'" ]
-
diff --git a/tests/test-lsmod/disabled02backcompat.sh b/tests/test-lsmod/disabled02backcompat.sh
deleted file mode 100755
index 38ebfd1..0000000
--- a/tests/test-lsmod/disabled02backcompat.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh
-
-MODTEST_DO_CREATE_MODULE=1
-export MODTEST_DO_CREATE_MODULE
-
-# Should fail to run (sys_create_module succeeds), not find lsmod.old.
-[ "`lsmod 2>&1`" = "Kernel requires old lsmod, but couldn't run ./lsmod.old: No such file or directory" ]
-
-# Create one for it to find, put it in the path
-echo '#! /bin/sh' > tests/tmp/lsmod.old
-echo 'echo -n LSMOD.OLD' >> tests/tmp/lsmod.old
-echo "for f; do echo -n \ \'\$f\'; done" >> tests/tmp/lsmod.old
-chmod a+x tests/tmp/lsmod.old
-PATH=`pwd`/tests/tmp:$PATH
-
-# If explicit path given, shouldn't search path.
-[ "`lsmod 2>&1`" = "Kernel requires old lsmod, but couldn't run ./lsmod.old: No such file or directory" ]
-
-# No args expected
-[ "`lsmod 2>&1`" = "LSMOD.OLD" ]
-
-# Args intact
-[ "`lsmod --some-wierd-option foo 2>&1`" = "LSMOD.OLD '--some-wierd-option' 'foo'" ]
diff --git a/tests/test-modinfo/disabled01backcompat.sh b/tests/test-modinfo/disabled01backcompat.sh
deleted file mode 100755
index ff9cab8..0000000
--- a/tests/test-modinfo/disabled01backcompat.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh
-
-MODTEST_DO_CREATE_MODULE=1
-export MODTEST_DO_CREATE_MODULE
-
-# Should fail to run (sys_create_module succeeds), not find modinfo.old.
-[ "`modinfo 2>&1`" = "Kernel requires old modinfo, but couldn't run ./modinfo.old: No such file or directory" ]
-
-# Create one for it to find, put it in the path
-echo '#! /bin/sh' > tests/tmp/modinfo.old
-echo 'echo -n MODINFO.OLD' >> tests/tmp/modinfo.old
-echo "for f; do echo -n \ \'\$f\'; done" >> tests/tmp/modinfo.old
-chmod a+x tests/tmp/modinfo.old
-PATH=`pwd`/tests/tmp:$PATH
-
-# If explicit path given, shouldn't search path.
-[ "`modinfo 2>&1`" = "Kernel requires old modinfo, but couldn't run ./modinfo.old: No such file or directory" ]
-
-# No args expected
-[ "`modinfo 2>&1`" = "MODINFO.OLD" ]
-
-# Args intact
-[ "`modinfo --some-wierd-option foo 2>&1`" = "MODINFO.OLD '--some-wierd-option' 'foo'" ]
diff --git a/tests/test-rmmod/disabled01backcompat.sh b/tests/test-rmmod/disabled01backcompat.sh
deleted file mode 100755
index d607df7..0000000
--- a/tests/test-rmmod/disabled01backcompat.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-
-MODTEST_DO_CREATE_MODULE=1
-export MODTEST_DO_CREATE_MODULE
-
-# Should fail to run (sys_create_module succeeds), not find rmmod.old.
-[ "`rmmod 2>&1`" = "Kernel requires old rmmod, but couldn't run ./rmmod.old: No such file or directory" ]
-
-# Create one for it to find, put it in the path
-echo '#! /bin/sh' > tests/tmp/rmmod.old
-echo 'echo -n RMMOD.OLD' >> tests/tmp/rmmod.old
-echo "for f; do echo -n \ \'\$f\'; done" >> tests/tmp/rmmod.old
-chmod a+x tests/tmp/rmmod.old
-PATH=`pwd`/tests/tmp:$PATH
-
-# If explicit path given, shouldn't search path.
-[ "`rmmod 2>&1`" = "Kernel requires old rmmod, but couldn't run ./rmmod.old: No such file or directory" ]
-
-# No args expected
-[ "`rmmod 2>&1`" = "RMMOD.OLD" ]
-
-# Args intact
-[ "`rmmod --some-wierd-option foo 2>&1`" = "RMMOD.OLD '--some-wierd-option' 'foo'" ]
-
--
To unsubscribe from this list: send the line "unsubscribe linux-modules" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
