summaryrefslogtreecommitdiff
path: root/modutils/modprobe.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
* modprobe,rmmod: reject module names with slashesDenys Vlasenko2014-11-201-0/+11
| | | | | | | function old new delta add_probe 86 113 +27 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modprobe-small: fix help messages for aliased module-related appletsDenys Vlasenko2014-04-191-1/+1
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* Whitespace fixesDenys Vlasenko2013-07-301-1/+1
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modprobe: accept -b even if blacklist functionality is disabledFelipe Contreras2012-01-311-7/+8
| | | | | Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modprobe: use hash table. speeds up significantly if modprobe.dep is largeTimo Teras2011-06-201-14/+29
| | | | | | | | | | | | | | | | function old new delta helper_get_module 106 157 +51 config_file_action 413 431 +18 modprobe_main 690 706 +16 do_modprobe 580 588 +8 add_probe 81 83 +2 load_modules_dep 192 190 -2 get_or_add_modentry 10 - -10 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 5/1 up/down: 95/-12) Total: 83 bytes Signed-off-by: Timo Teras <timo.teras@iki.fi> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* *: remove "Options:" string from help textsDenys Vlasenko2011-06-051-2/+1
| | | | | | | function old new delta packed_usage 28706 28623 -83 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modprobe: fix "modprobe -l name-with-dash"Denys Vlasenko2011-02-151-1/+4
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* whitespace fixesDenys Vlasenko2011-02-031-1/+1
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modprobe/insmod: fix parameter quotingDenys Vlasenko2011-02-021-1/+1
| | | | | | | | | | | function old new delta parse_cmdline_module_options 102 157 +55 modprobe_main 657 662 +5 insmod_main 68 70 +2 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/0 up/down: 62/0) Total: 62 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* mass removal of underscores from _BB_DIR_foo and _BB_SUID_fooDenys Vlasenko2011-01-181-1/+1
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modprobe: add -D option (synonym of --show-depends)Serj Kalichev2010-12-281-54/+67
| | | | | | | | | | | | | | | | | The modern module-init-tools 3.12 has "-D" option and it works. The --show-depends and -a options can be used together due to upstream modprobe behaviour. function old new delta do_modprobe 536 579 +43 packed_usage 28035 28042 +7 modprobe_main 653 657 +4 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/0 up/down: 54/0) Total: 54 bytes Signed-off-by: Serj Kalichev <serj.kalichev@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modprobe: add support for --show-dependsSerj Kalichev2010-12-261-35/+60
| | | | | | | | | | | | | function old new delta modprobe_longopts - 16 +16 packed_usage 28018 28028 +10 modprobe_main 648 653 +5 do_modprobe 580 536 -44 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 2/1 up/down: 31/-44) Total: -13 bytes Signed-off-by: Serj Kalichev <serj.kalichev@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modutils/*: move applet bits into corresponding *.c filesDenys Vlasenko2010-10-151-11/+14
| | | | Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
* *: make GNU licensing statement forms more regularDenys Vlasenko2010-08-161-1/+1
| | | | | | | This change retains "or later" state! No licensing _changes_ here, only form is adjusted (article, space between "GPL" and "v2" and so on). Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* Modprobe: Make -l open the right fileLauri Kasanen2010-07-101-5/+5
| | | | | | | | | | Before: modprobe -l modules.dep not found No size change, just moved the chdir. Signed-off-by: Lauri Kasanen <curaga@operamail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modprobe: add support for -l and -s. Remove some unsupported optionsPascal Bellard2010-06-071-31/+140
| | | | | | | | | | | | Fixed some goofs in help text function old new delta modprobe_main 494 653 +159 packed_usage 27129 27145 +16 insmod_main 98 95 -3 Signed-off-by: Pascal Bellard <pascal.bellard@ads-lu.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* *: merge some common stringsDenys Vlasenko2010-03-231-2/+2
| | | | | | | | text data bss dec hexfilename 838650 8009 0 846659 ceb43busybox_old 838519 8009 0 846528 ceac0busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modprobe: remove 2k limit on /proc/cmdlineDenys Vlasenko2010-03-031-7/+5
| | | | | | | | function old new delta do_modprobe 365 520 +155 parse_and_add_kcmdline_module_options 149 - -149 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modprobe: pick up module options from /proc/cmdline tooDenys Vlasenko2010-02-271-0/+34
| | | | | | | | | | Based on patch by Ozan Çağlayan (ozan AT pardus.org.tr) function old new delta parse_and_add_kcmdline_module_options - 149 +149 do_modprobe 357 365 +8 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* *: suppress ~60% of "aliased warnings" on gcc-4.4.1Denys Vlasenko2010-02-041-1/+1
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modprobe: protect against possible SEGVDenys Vlasenko2010-01-261-6/+8
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modprobe: it's not an error if module is already loaded. Closes bug 833Denys Vlasenko2010-01-101-0/+2
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* tidy up O_NONBLOCK usage. use libbb functions in stty.Denys Vlasenko2009-11-111-1/+1
| | | | | | | | | | Added O_RDONLY where improves readability. Note: O_RDONLY == 0, so it is there even if not specified. function old new delta stty_main 1289 1235 -54 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modprobe: treat tabs in modules.dep as delimiters too. closes bug 567Denys Vlasenko2009-08-141-1/+1
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modprobe: do not use ->probed_name blidlyDenys Vlasenko2009-06-171-3/+10
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modprobe: correct exitcode handling and error messages with respect to -qDenys Vlasenko2009-06-171-64/+95
| | | | | | | | | | | | | | function old new delta do_modprobe 319 339 +20 bb_delete_module 10 26 +16 moderror 62 71 +9 bb_init_module 112 119 +7 modprobe_main 488 494 +6 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 5/0 up/down: 58/0) Total: 58 bytes Signed-off-by: Gilles Espinasse <g.esp@free.fr> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modprobe: fix more bugs in modprobe -rDenys Vlasenko2009-05-281-7/+15
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modprobe: fix modprobe -r. closes bug 315Denys Vlasenko2009-05-261-2/+4
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* modprobe: add comment about expected modules.dep formatMike Frysinger2009-05-061-0/+5
| | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* modprobe: add more useful debug pointsMike Frysinger2009-05-051-2/+10
| | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* *: mass renaming of USE_XXXX to IF_XXXXDenis Vlasenko2009-04-211-1/+1
| | | | | | and SKIP_XXXX to IF_NOT_XXXX - the second one was especially badly named. It was not skipping anything!
* further work on modprobeDenis Vlasenko2009-03-061-74/+110
| | | | | | | | | | | | | function old new delta gather_options_str - 75 +75 config_file_action 388 413 +25 load_modules_dep 175 192 +17 add_probe 67 72 +5 modprobe_main 494 488 -6 gather_options 89 - -89 ------------------------------------------------------------------------------ (add/remove: 1/1 grow/shrink: 3/1 up/down: 122/-95) Total: 27 bytes
* modprobe: rework/speedup by Timo Teras (timo.teras AT iki.fi)Denis Vlasenko2009-03-051-145/+217
| | | | | | | | | | | | | | | | | | | | | | function old new delta load_modules_dep - 175 +175 helper_get_module - 106 +106 gather_options - 89 +89 add_probe - 67 +67 config_file_action 345 388 +43 get_or_add_modentry - 10 +10 loaded 4 - -4 read_config 239 234 -5 llist_find 34 - -34 add_option 60 - -60 modprobe_main 567 494 -73 do_modprobe 601 273 -328 ------------------------------------------------------------------------------ (add/remove: 5/3 grow/shrink: 1/3 up/down: 490/-504) Total: -14 bytes text data bss dec hex filename 816778 476 7888 825142 c9736 busybox_old 816768 476 7880 825124 c9724 busybox_unstripped
* modprobe: emit "can't open 'modules.dep': (errno)" instead of "module not found"Denis Vlasenko2009-03-031-13/+14
| | | | | | | | | | | | | | | | *: s/can't open %s/can't open '%s'/, it's better to use same string. function old new delta do_modprobe 588 601 +13 config_file_action 339 345 +6 modprobe_main 565 570 +5 unable_to_open 14 16 +2 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 4/0 up/down: 26/0) Total: 26 bytes text data bss dec hex filename 816800 476 7892 825168 c9750 busybox_old 816812 476 7892 825180 c975c busybox_unstripped
* *: tweak error messagesDenis Vlasenko2008-12-241-2/+2
| | | | | | | | | | sysctl: shrink; support recursing if name is a directory: "sysctl net.ipv4.conf". Patch by xmaks AT email.cz text data bss dec hex filename 793659 504 7492 801655 c3b77 busybox_old 793576 504 7492 801572 c3b24 busybox_unstripped
* modprobe: fix a segfault when modprobe is called with no arguments at allDenis Vlasenko2008-10-311-24/+28
| | | | | | function old new delta modprobe_main 559 535 -24
* modutils/*: rewrite by Timo Teras <timo.teras AT iki.fi>Denis Vlasenko2008-09-131-885/+218
| | | | | | | | | | | | | | | - a lot faster (linear algorithmic complexity, smaller memory foot print) - a lot smaller (the old code was overly complicated) - loading of aliases is now module-init-tools compliant - blacklisting is done correctly (-b option added) - module argument quoting done right - depmod now correctly generates modules.symbols and modules.alias add/remove: 16/21 grow/shrink: 4/6 up/down: 6930/-9316 Total: -2386 bytes text data bss dec hex filename 806039 592 6680 813311 c68ff busybox_old 803498 592 6676 810766 c5f0e busybox_unstripped
* modprobe: semi-trivial code shrinkDenis Vlasenko2008-08-061-52/+47
| | | | | | | | | | function old new delta build_dep 870 859 -11 already_loaded 134 112 -22 modprobe_main 449 368 -81 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-114) Total: -114 bytes
* modprobe: use buffering line reads (fgets) instead of reads().Denis Vlasenko2008-08-041-19/+20
| | | | | | | | | | | | | | | libbb: remove reads() function old new delta include_conf_file_act 961 980 +19 localcmd 282 284 +2 already_loaded 155 151 -4 in_cksum 58 53 -5 modprobe_main 1630 1624 -6 reads 129 - -129 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 2/3 up/down: 21/-144) Total: -123 bytes
* hush: add #defines to switch off break/continue if loops are not supportedDenis Vlasenko2008-07-291-1/+1
| | | | | | *: remove a few inline keywords no code changes
* modprobe: support for /etc/modprobe.d, by Timo Teras.Denis Vlasenko2008-07-291-63/+106
| | | | | | | | | | | | | | function old new delta include_conf_file_act - 929 +929 include_conf_recursive - 30 +30 include_conf_file2 - 30 +30 include_conf_file - 14 +14 include_conf_dir_act - 14 +14 build_dep 1011 875 -136 include_conf 922 - -922 ------------------------------------------------------------------------------ (add/remove: 5/1 grow/shrink: 0/1 up/down: 1017/-1058) Total: -41 bytes
* libbb: introduce and use xrealloc_vectorDenis Vlasenko2008-07-081-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | function old new delta xrealloc_vector_helper - 51 +51 create_list 84 99 +15 getopt_main 690 695 +5 passwd_main 1049 1053 +4 get_cached 85 89 +4 msh_main 1377 1380 +3 add_match 42 41 -1 read_lines 720 718 -2 grave 1068 1066 -2 fill_match_lines 143 141 -2 add_to_dirlist 67 65 -2 add_input_file 49 47 -2 act 252 250 -2 fsck_main 2252 2246 -6 man_main 765 757 -8 bb_internal_initgroups 228 220 -8 cut_main 1052 1041 -11 add_edge_to_node 55 43 -12 dpkg_main 3851 3835 -16 ifupdown_main 2202 2178 -24 sort_main 838 812 -26 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 5/15 up/down: 82/-124) Total: -42 bytes
* mdoprobe: fix SEGV bug (by Vlad Dronnikov)Denis Vlasenko2008-06-221-3/+1
|
* whitespace and comment fixes, no code changesDenis Vlasenko2008-06-161-3/+3
|
* - shrink modprobe a little bit (~-40 bytes). ACKed by Yann.Bernhard Reutner-Fischer2008-05-311-8/+5
|
* - fix overflow; improve documentation while at itBernhard Reutner-Fischer2008-05-281-9/+9
|
* - Add config option for DEFAULT_DEPMOD_FILE and DEFAULT_DEPMOD_FILE.Bernhard Reutner-Fischer2008-05-271-8/+8
| | | | No obj-code changes.
* modprobe: fix for blacklistingDenis Vlasenko2008-05-221-4/+5
| | | | | | | | | | | | The patch makes the order of the alias/blacklist in modprobe.conf irrelevant (like module-utils' modprobe). In first patch the alias had to be defined before the blacklist which caused problems because the modprobe.conf file is read before /lib/modules/*/modules.alias. The attatched patch will mark the blacklisted module itself rather than trying to find the alias that points to the blacklisted module and test this flag later in the alias resolving stage.
* modprobe: optional "blacklist" command support (by Natanael Copa)Denis Vlasenko2008-05-181-5/+26
| | | | | | | | | is_conf_command - 56 +56 include_conf 898 917 +19 check_dep 348 356 +8 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 2/0 up/down: 83/0) Total: 83 bytes
* save a bit of code with *strchrnul = '\0' trickDenis Vlasenko2007-12-261-4/+1
| | | | | | | | | function old new delta nextline 59 55 -4 include_conf 902 898 -4 read_config 414 406 -8 fsck_main 1880 1869 -11