diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2003-03-10 20:34:06 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2003-03-10 20:34:06 +0000 |
commit | c9cb0b941256701c10ac039f86120413fec32c83 (patch) | |
tree | 537e6c70482cfc5e2afdd5675ad8850d19674c2f /sys-apps/module-init-tools/files | |
parent | Marked xchat-2.0.0.ebuild ppc stable (diff) | |
download | gentoo-2-c9cb0b941256701c10ac039f86120413fec32c83.tar.gz gentoo-2-c9cb0b941256701c10ac039f86120413fec32c83.tar.bz2 gentoo-2-c9cb0b941256701c10ac039f86120413fec32c83.zip |
fix -q and -s; do not output to console if -s was given
Diffstat (limited to 'sys-apps/module-init-tools/files')
12 files changed, 66 insertions, 161 deletions
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r1 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r1 deleted file mode 100644 index b1a08c3a2d21..000000000000 --- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 f8a88214e06d102a2044af3b95256f2a module-init-tools-0.9.10.tar.bz2 99143 -MD5 6c5d2a62ae98708f3ad0c57900d63919 modutils-2.4.22.tar.bz2 219457 diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r2 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r2 deleted file mode 100644 index b1a08c3a2d21..000000000000 --- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 f8a88214e06d102a2044af3b95256f2a module-init-tools-0.9.10.tar.bz2 99143 -MD5 6c5d2a62ae98708f3ad0c57900d63919 modutils-2.4.22.tar.bz2 219457 diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r3 index b1a08c3a2d21..5d5b645cfd81 100644 --- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10 +++ b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r3 @@ -1,2 +1,3 @@ MD5 f8a88214e06d102a2044af3b95256f2a module-init-tools-0.9.10.tar.bz2 99143 +MD5 4c3a76d0917ea3b5309302d8f6c8806c modutils-2.4.21.tar.bz2 217896 MD5 6c5d2a62ae98708f3ad0c57900d63919 modutils-2.4.22.tar.bz2 219457 diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.7 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.7 deleted file mode 100644 index 4cd5fb2838a9..000000000000 --- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.7 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 77fa0593de0ef45b2a5b7cb1ca4134c0 module-init-tools-0.9.7.tar.bz2 93398 -MD5 6c5d2a62ae98708f3ad0c57900d63919 modutils-2.4.22.tar.bz2 219457 diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.9_pre1 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.9_pre1 deleted file mode 100644 index d215d9165b59..000000000000 --- a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.9_pre1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 2342f8c38390eec70d0d7585c870f9d0 module-init-tools-0.9.9-pre.tar.bz2 95603 -MD5 6c5d2a62ae98708f3ad0c57900d63919 modutils-2.4.22.tar.bz2 219457 diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-more-recursive-bugs.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-recursion.patch index 5ba40ab019ea..66f46409f8e2 100644 --- a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-more-recursive-bugs.patch +++ b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-recursion.patch @@ -1,6 +1,6 @@ ---- module-init-tools-0.9.10/modprobe.c.orig 2003-03-09 13:47:46.000000000 +0200 -+++ module-init-tools-0.9.10/modprobe.c 2003-03-09 13:49:09.000000000 +0200 -@@ -1096,12 +1096,14 @@ +--- 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': @@ -15,7 +15,19 @@ config = optarg; break; case 'o': -@@ -1156,15 +1158,25 @@ +@@ -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 @@ } } @@ -28,22 +40,20 @@ + if ((getenv("MODPROBE_CONFIG")) && (NULL == config)) + config = NOFAIL(strdup(getenv("MODPROBE_CONFIG"))); + - /* Check MODPROBE_QUIET */ -- if (getenv("MODPROBE_QUIET")) -+ if ((getenv("MODPROBE_QUIET")) && -+ (0 != fail_if_already) && (0 != fail_if_missing)) - if (0 == strcmp(getenv("MODPROBE_QUIET"), "1")) { - fail_if_already = 0; - fail_if_missing = 0; - } - - /* Check MODPROBE_LOG */ -- if (getenv("MODPROBE_LOG")) ++ /* 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; - -@@ -1206,8 +1218,10 @@ ++ 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; diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-recursive-logging.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-recursive-logging.patch deleted file mode 100644 index a4e8cb257c18..000000000000 --- a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-fix-recursive-logging.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- module-init-tools-0.9.10/modprobe.c.orig 2003-03-09 11:46:19.000000000 +0200 -+++ module-init-tools-0.9.10/modprobe.c 2003-03-09 11:50:23.000000000 +0200 -@@ -1135,6 +1135,7 @@ - fail_if_missing = 0; - break; - case 's': -+ setenv("MODPROBE_LOG", "1", 1); - log = 1; - break; - case 'i': -@@ -1162,6 +1163,11 @@ - fail_if_missing = 0; - } - -+ /* Check MODPROBE_LOG */ -+ if (getenv("MODPROBE_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); 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 new file mode 100644 index 000000000000..00889672d638 --- /dev/null +++ b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-no-stdout-on-log.patch @@ -0,0 +1,24 @@ +--- 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-shutup-modprobe.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-shutup-modprobe.patch deleted file mode 100644 index 3987d05f3f2e..000000000000 --- a/sys-apps/module-init-tools/files/module-init-tools-0.9.10-shutup-modprobe.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- module-init-tools-0.9.10/generate-modprobe.conf.orig 2003-03-02 20:20:24.000000000 +0200 -+++ module-init-tools-0.9.10/generate-modprobe.conf 2003-03-02 20:20:28.000000000 +0200 -@@ -155,16 +155,16 @@ - above) - # Pull in these modules after me. - INSTALL_COMMANDS="$INSTALL_COMMANDS $MODULE" -- eval post_install_$MODNAME=\"`multi "$REST" 'modprobe' '; '`\; /bin/true\" -+ eval post_install_$MODNAME=\"`multi "$REST" 'modprobe -q' '; '`\; /bin/true\" - REMOVE_COMMANDS="$REMOVE_COMMANDS $MODULE" -- eval pre_remove_$MODNAME=\"`multi "$REST" 'modprobe -r' '; '`\" -+ eval pre_remove_$MODNAME=\"`multi "$REST" 'modprobe -qr' '; '`\" - ;; - below) - # Pull in these modules before me. - INSTALL_COMMANDS="$INSTALL_COMMANDS $MODULE" -- eval pre_install_$MODNAME=\"`multi "$REST" 'modprobe' '; '`\" -+ eval pre_install_$MODNAME=\"`multi "$REST" 'modprobe -q' '; '`\" - REMOVE_COMMANDS="$REMOVE_COMMANDS $MODULE" -- eval post_remove_$MODNAME=\"`multi "$REST" 'modprobe -r' '; '`\; /bin/true\" -+ eval post_remove_$MODNAME=\"`multi "$REST" 'modprobe -qr' '; '`\; /bin/true\" - ;; - probe) - INSTALL_COMMANDS="$INSTALL_COMMANDS $MODULE" -@@ -173,7 +173,7 @@ - probeall) - # Not quite correct. If they all fail, we should fail. - INSTALL_COMMANDS="$INSTALL_COMMANDS $MODULE" -- eval install_$MODNAME=\"`multi "$REST" 'modprobe' '; '`\; /bin/true\" -+ eval install_$MODNAME=\"`multi "$REST" 'modprobe -q' '; '`\; /bin/true\" - ;; - post-install) - INSTALL_COMMANDS="$INSTALL_COMMANDS $MODULE" ---- module-init-tools-0.9.10/modprobe.c.orig 2003-03-02 22:19:25.000000000 +0200 -+++ module-init-tools-0.9.10/modprobe.c 2003-03-02 22:42:08.000000000 +0200 -@@ -1081,6 +1081,7 @@ - int strip_vermagic = 0; - int strip_modversion = 0; - int fail_if_already = 1; -+ int fail_if_missing = 1; - char *type = NULL; - const char *config = NULL, *command = NULL; - char *dirname, *optstring = NOFAIL(strdup("")); -@@ -1129,7 +1130,9 @@ - break; - case 'q': - /* FIXME: should do more than this. */ -+ setenv("MODPROBE_QUIET", "1", 1); - fail_if_already = 0; -+ fail_if_missing = 0; - break; - case 's': - log = 1; -@@ -1152,6 +1155,13 @@ - } - } - -+ /* Check MODPROBE_QUIET */ -+ if (getenv("MODPROBE_QUIET")) -+ if (0 == strcmp(getenv("MODPROBE_QUIET"), "1")) { -+ fail_if_already = 0; -+ fail_if_missing = 0; -+ } -+ - /* If stderr not open, go to syslog */ - if (log || fstat(STDERR_FILENO, &statbuf) != 0) { - openlog("modprobe", LOG_CONS, LOG_DAEMON); -@@ -1263,7 +1273,10 @@ - remove ? "remove" : "install"); - goto out; - } -- fatal("Module %s not found.\n", modname); -+ if (fail_if_missing) -+ fatal("Module %s not found.\n", modname); -+ else -+ exit(1); - } - - if (remove) 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 new file mode 100644 index 000000000000..5e3f9f245db9 --- /dev/null +++ b/sys-apps/module-init-tools/files/module-init-tools-0.9.10-use-modprobe_conf.patch @@ -0,0 +1,12 @@ +--- 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 diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.7-fix-generate-modprobe.conf-two-param.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.7-fix-generate-modprobe.conf-two-param.patch deleted file mode 100644 index e4314f496a29..000000000000 --- a/sys-apps/module-init-tools/files/module-init-tools-0.9.7-fix-generate-modprobe.conf-two-param.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- module-init-tools-0.9.7/generate-modprobe.conf.orig 2002-12-29 11:46:07.000000000 +0200 -+++ module-init-tools-0.9.7/generate-modprobe.conf 2002-12-29 11:46:17.000000000 +0200 -@@ -2,7 +2,7 @@ - - # Naive shell script to translate modules.conf + defaults to modprobe.conf - # Normal caveats apply, as with any machine translation. --if [ $# -gt 1 -o x"$1" = x--help ]; then -+if [ $# -gt 2 -o x"$1" = x--help ]; then - echo "Usage: $0 [modprobe.conf]" - echo " Converts your current modules setup to modprobe.conf." - echo " Don't trust it too much." diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.7-generate-modprobe.conf-add-missing-semicolons.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.7-generate-modprobe.conf-add-missing-semicolons.patch deleted file mode 100644 index 2f25a3ecc369..000000000000 --- a/sys-apps/module-init-tools/files/module-init-tools-0.9.7-generate-modprobe.conf-add-missing-semicolons.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- module-init-tools-0.9.7/generate-modprobe.conf.orig 2002-12-29 17:17:52.000000000 +0200 -+++ module-init-tools-0.9.7/generate-modprobe.conf 2002-12-29 17:17:56.000000000 +0200 -@@ -269,8 +269,8 @@ - eval PREINSTALL=\"\$pre_install_$MODNAME\" - eval POSTINSTALL=\"\$post_install_$MODNAME\" - eval INSTALL=\"\$\{install_$MODNAME:-/sbin/modprobe --ignore-install $mod}\" -- if [ -n "$PREINSTALL" ]; then PREINSTALL="{ $PREINSTALL }; "; fi -- if [ -n "$POSTINSTALL" ]; then POSTINSTALL="&& { $POSTINSTALL }"; fi -+ if [ -n "$PREINSTALL" ]; then PREINSTALL="{ $PREINSTALL; }; "; fi -+ if [ -n "$POSTINSTALL" ]; then POSTINSTALL="&& { $POSTINSTALL; }"; fi - echo install $mod $PREINSTALL $INSTALL $POSTINSTALL - done - -@@ -280,7 +280,7 @@ - eval PREREMOVE=\"\$pre_remove_$MODNAME\" - eval POSTREMOVE=\"\$post_remove_$MODNAME\" - eval REMOVE=\"\$\{remove_$MODNAME:-/sbin/modprobe -r --ignore-remove $mod}\" -- if [ -n "$PREREMOVE" ]; then PREREMOVE="{ $PREREMOVE }; "; fi -- if [ -n "$POSTREMOVE" ]; then POSTREMOVE="&& { $POSTREMOVE }"; fi -+ if [ -n "$PREREMOVE" ]; then PREREMOVE="{ $PREREMOVE; }; "; fi -+ if [ -n "$POSTREMOVE" ]; then POSTREMOVE="&& { $POSTREMOVE; }"; fi - echo remove $mod $PREREMOVE $REMOVE $POSTREMOVE - done |