diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2003-09-15 21:49:06 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2003-09-15 21:49:06 +0000 |
commit | 52e3bd1aff32bf6aea3ff180e464c577fa4d0c29 (patch) | |
tree | ea3c35a39842f16bcd15213f10ac5885e6789271 /sys-apps/module-init-tools/files | |
parent | version bump; cleaned old versions (you do not see the last commit message...) (diff) | |
download | gentoo-2-52e3bd1aff32bf6aea3ff180e464c577fa4d0c29.tar.gz gentoo-2-52e3bd1aff32bf6aea3ff180e464c577fa4d0c29.tar.bz2 gentoo-2-52e3bd1aff32bf6aea3ff180e464c577fa4d0c29.zip |
cleanup
Diffstat (limited to 'sys-apps/module-init-tools/files')
8 files changed, 0 insertions, 210 deletions
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r5 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r5 deleted file mode 100644 index 06ecbad3d4d4..000000000000 --- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r5 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 f8a88214e06d102a2044af3b95256f2a module-init-tools-0.9.10.tar.bz2 99143 -MD5 16170af2981db98367c6f140a1534668 modutils-2.4.24.tar.bz2 220279 diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.11-r3 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.11-r3 deleted file mode 100644 index bff888302de5..000000000000 --- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.11-r3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 6a6e738f2e545692f58f724253b4b628 module-init-tools-0.9.11.tar.bz2 99987 -MD5 2c0cca3ef6330a187c6ef4fe41ecaa4d modutils-2.4.25.tar.bz2 220530 diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.11a b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.11a deleted file mode 100644 index b4bb887cdcec..000000000000 --- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.11a +++ /dev/null @@ -1,5 +0,0 @@ -MD5 060ce311606657915548168939e965b4 /files/modutils-2.4.22-no-above-below.patch 382 -MD5 45ebc93263c86224eb12c3f2c71d9275 /files/module-init-tools-0.9.11-be-quiet-for-devfsd.patch 4208 -MD5 a26c14af428e0efbe46296271a65b078 /module-init-tools-0.9.11a.ebuild 4562 -MD5 d1e519e808d6c6b288ca25a6f03b78ba module-init-tools-0.9.11a.tar.bz2 110524 -MD5 2c0cca3ef6330a187c6ef4fe41ecaa4d modutils-2.4.25.tar.bz2 220530 diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12 deleted file mode 100644 index da7deba7e67b..000000000000 --- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12 +++ /dev/null @@ -1,2 +0,0 @@ -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.10-be-quiet-for-devfsd.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-be-quiet-for-devfsd.patch deleted file mode 100644 index 36ca968d2226..000000000000 --- a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-be-quiet-for-devfsd.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- module-init-tools-0.9.10/modprobe.c.orig 2003-03-15 06:51:14.000000000 +0200 -+++ module-init-tools-0.9.10/modprobe.c 2003-03-15 07:57:58.000000000 +0200 -@@ -50,6 +50,8 @@ - - /* Do we use syslog or stderr for messages? */ - static int log; -+/* Should we be totally quiet? */ -+static int quiet = 0; - - static int getlen(const char *fmt, va_list ap) - { -@@ -68,6 +70,9 @@ - va_list arglist; - int len; - -+ if (quiet) -+ return; -+ - va_start(arglist, fmt); - len = strlen(prefix) + getlen(fmt, arglist) + 1; - buf = malloc(len); -@@ -85,7 +90,7 @@ - - #define warn(fmt, ...) message("WARNING: ", fmt , ## __VA_ARGS__) - #define fatal(fmt, ...) \ -- do { message("FATAL: ", fmt , ## __VA_ARGS__); exit(1); } while(0) -+ do { message("FATAL: ", fmt , ## __VA_ARGS__); if (quiet) exit(0); else exit(1); } while(0) - - static void grammar(const char *cmd, const char *filename, unsigned int line) - { -@@ -1161,10 +1166,6 @@ - if (0 == strcmp(getenv("MODPROBE_VERBOSE"), "1")) - verbose = 1; - -- /* Check MODPROBE_CONFIG */ -- if ((getenv("MODPROBE_CONFIG")) && (NULL == config)) -- config = NOFAIL(strdup(getenv("MODPROBE_CONFIG"))); -- - /* Check MODPROBE_QUIET */ - if ((getenv("MODPROBE_QUIET")) && (0 != fail_if_already)) - if (0 == strcmp(getenv("MODPROBE_QUIET"), "1")) -@@ -1175,6 +1176,18 @@ - if (0 == strcmp(getenv("MODPROBE_LOG"), "1")) - log = 1; - -+ /* If no logging, and we have 'MODPROBE_CONFIG=/etc/modprobe.devfs', then -+ * be totally quiet. Note that this catches recursive calls, so it should -+ * not be a first call to modprobe, and we should check it *before* we -+ * check MODPROBE_CONFIG ... */ -+ if ((!log) && (!config) && (getenv("MODPROBE_CONFIG"))) -+ if (0 == strcmp(getenv("MODPROBE_CONFIG"), "/etc/modprobe.devfs")) -+ quiet = 1; -+ -+ /* Check MODPROBE_CONFIG */ -+ if ((getenv("MODPROBE_CONFIG")) && (NULL == config)) -+ config = NOFAIL(strdup(getenv("MODPROBE_CONFIG"))); -+ - /* If logging was requested, do not output to stdout */ - if (log) { - openlog("modprobe", 0, LOG_DAEMON); -@@ -1226,6 +1239,35 @@ - } - } - -+ /* Another 'not so horrible' hack to have absolutely no output if we -+ * have no logging enabled, and our config file is /etc/modprobe.devfs -+ * -+ * Rasionale: This is what modprobe from modutils-2.4.22 does: -+ * -+ * gateway root # modprobe /dev/sd1 -+ * modprobe: Can't locate module /dev/sd1 -+ * gateway root # modprobe -C /etc/modules.conf /dev/sd1 -+ * modprobe: Can't locate module /dev/sd1 -+ * gateway root # modprobe -C /etc/modules.devfs /dev/sd1 -+ * gateway root # modprobe foo -+ * modprobe: Can't locate module foo -+ * gateway root # modprobe -C /etc/modules.conf foo -+ * modprobe: Can't locate module foo -+ * gateway root # modprobe -C /etc/modules.devfs foo -+ * modprobe: Can't locate module foo -+ * gateway root # -+ * gateway root # modprobe -C /etc/modules.devfs /dev/sd1 && echo yes -+ * yes -+ * gateway root # modprobe -C /etc/modules.devfs foo && echo yes -+ * modprobe: Can't locate module foo -+ * gateway root # -+ */ -+ if ((!log) && (!quiet) && (!dump_only) && -+ (strncmp(argv[optind], "/dev/", 5) == 0) && -+ ((config) && (0 == strcmp(config, "/etc/modprobe.devfs")))) -+ quiet = 1; -+ -+ - /* -r only allows certain restricted options */ - if (remove) { - if (strcmp(optstring, "") != 0) diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-recursion.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-recursion.patch deleted file mode 100644 index 66f46409f8e2..000000000000 --- a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-recursion.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- module-init-tools-0.9.10/modprobe.c.orig 2003-03-10 19:34:08.000000000 +0200 -+++ module-init-tools-0.9.10/modprobe.c 2003-03-10 19:33:29.000000000 +0200 -@@ -1095,12 +1095,14 @@ - while ((opt = getopt_long(argc, argv, "vVC:o:rknqsclt:aif", options, NULL)) != -1){ - switch (opt) { - case 'v': -+ setenv("MODPROBE_VERBOSE", "1", 1); - verbose = 1; - break; - case 'V': - puts(PACKAGE " version " VERSION); - exit(0); - case 'C': -+ setenv("MODPROBE_CONFIG", optarg, 1); - config = optarg; - break; - case 'o': -@@ -1129,9 +1131,11 @@ - break; - case 'q': - /* FIXME: should do more than this. */ -+ setenv("MODPROBE_QUIET", "1", 1); - fail_if_already = 0; - break; - case 's': -+ setenv("MODPROBE_LOG", "1", 1); - log = 1; - break; - case 'i': -@@ -1152,6 +1156,25 @@ - } - } - -+ /* Check MODPROBE_VERBOSE */ -+ if ((getenv("MODPROBE_VERBOSE")) && (1 != verbose)) -+ if (0 == strcmp(getenv("MODPROBE_VERBOSE"), "1")) -+ verbose = 1; -+ -+ /* Check MODPROBE_CONFIG */ -+ if ((getenv("MODPROBE_CONFIG")) && (NULL == config)) -+ config = NOFAIL(strdup(getenv("MODPROBE_CONFIG"))); -+ -+ /* Check MODPROBE_QUIET */ -+ if ((getenv("MODPROBE_QUIET")) && (0 != fail_if_already)) -+ if (0 == strcmp(getenv("MODPROBE_QUIET"), "1")) -+ fail_if_already = 0; -+ -+ /* Check MODPROBE_LOG */ -+ if ((getenv("MODPROBE_LOG")) && (1 != log)) -+ if (0 == strcmp(getenv("MODPROBE_LOG"), "1")) -+ log = 1; -+ - /* If stderr not open, go to syslog */ - if (log || fstat(STDERR_FILENO, &statbuf) != 0) { - openlog("modprobe", LOG_CONS, LOG_DAEMON); -@@ -1190,8 +1213,10 @@ - if (config && !dump_only && strncmp(argv[optind], "/dev/", 5) == 0) { - if (strcmp("/etc/modules.conf", config) == 0) - config = NULL; -- else if (strcmp("/etc/modules.devfs", config) == 0) -+ else if (strcmp("/etc/modules.devfs", config) == 0) { - config = "/etc/modprobe.devfs"; -+ setenv("MODPROBE_CONFIG", "/etc/modprobe.devfs", 1); -+ } - } - - /* -r only allows certain restricted options */ diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-no-stdout-on-log.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-no-stdout-on-log.patch deleted file mode 100644 index 00889672d638..000000000000 --- a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-no-stdout-on-log.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- module-init-tools-0.9.10/modprobe.c.orig 2003-03-10 20:19:33.000000000 +0200 -+++ module-init-tools-0.9.10/modprobe.c 2003-03-10 21:39:57.000000000 +0200 -@@ -1175,11 +1175,18 @@ - if (0 == strcmp(getenv("MODPROBE_LOG"), "1")) - log = 1; - -- /* If stderr not open, go to syslog */ -- if (log || fstat(STDERR_FILENO, &statbuf) != 0) { -- openlog("modprobe", LOG_CONS, LOG_DAEMON); -+ /* If logging was requested, do not output to stdout */ -+ if (log) { -+ openlog("modprobe", 0, LOG_DAEMON); - log = 1; - } -+ -+ /* If stderr not open and logging was not requested, go to syslog */ -+ if (!log) -+ if (fstat(STDERR_FILENO, &statbuf) != 0) { -+ openlog("modprobe", LOG_CONS, LOG_DAEMON); -+ log = 1; -+ } - - if (argc < optind + 1 && !dump_only && !list_only) - print_usage(argv[0]); diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-use-modprobe_conf.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-use-modprobe_conf.patch deleted file mode 100644 index 5e3f9f245db9..000000000000 --- a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-use-modprobe_conf.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- generate-modprobe.conf.orig 2003-03-10 19:59:48.000000000 +0200 -+++ generate-modprobe.conf 2003-03-10 20:00:38.000000000 +0200 -@@ -18,6 +18,9 @@ - - if [ x"$TESTING_MODPROBE_CONF" != x ]; then - cp $TESTING_MODPROBE_CONF $MODPROBECONF -+elif [ -x /sbin/modprobe.conf ]; then -+ # In sbin. -+ /sbin/modprobe.conf -c > $MODPROBECONF - elif [ -x /sbin/modprobe.old ]; then - # In sbin. - /sbin/modprobe.old -c > $MODPROBECONF |