diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2012-02-27 15:59:09 -0500 |
|---|---|---|
| committer | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-02-27 18:49:36 -0300 |
| commit | aa5da52c3ba4bb770c2a96067ef9c2f90472d615 (patch) | |
| tree | 4c62cbddee5df78218f7cd58a8b9341252bdd698 | |
| parent | ee1d188f70574b626090c417ff75cd0dbf6cfa27 (diff) | |
| download | kmod-fixup.tar.gz | |
modprobe: show builtin label on --show-dependsfixup
Previously, we didn't handle builtins very well, displaying things like:
$ modprobe -D btrfs
insmod /lib/modules/3.2.6-foo/kernel/crypto/crc32c.ko.gz
insmod (null)
insmod /lib/modules/3.2.6-foo/kernel/lib/libcrc32c.ko.gz
insmod /lib/modules/3.2.6-foo/kernel/lib/zlib_deflate/zlib_deflate.ko.gz
insmod /lib/modules/3.2.6-foo/kernel/fs/btrfs/btrfs.ko.gz
Follow module-init-tools and show builtins with the label 'builtin' and
their name:
$ modprobe -D btrfs
insmod /lib/modules/3.2.6-foo/kernel/crypto/crc32c.ko.gz
builtin intel_crc32c
insmod /lib/modules/3.2.6-foo/kernel/lib/libcrc32c.ko.gz
insmod /lib/modules/3.2.6-foo/kernel/lib/zlib_deflate/zlib_deflate.ko.gz
insmod /lib/modules/3.2.6-foo/kernel/fs/btrfs/btrfs.ko.gz
| -rw-r--r-- | tools/kmod-modprobe.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c index b94bdf3..55f3795 100644 --- a/tools/kmod-modprobe.c +++ b/tools/kmod-modprobe.c @@ -542,7 +542,9 @@ static void print_action(struct kmod_module *m, bool install, printf("install %s %s\n", kmod_module_get_install_commands(m), options); else - printf("insmod %s %s\n", kmod_module_get_path(m), options); + kmod_module_get_initstate(m) == KMOD_MODULE_BUILTIN + ? printf("builtin %s\n", kmod_module_get_name(m)) + : printf("insmod %s %s\n", kmod_module_get_path(m), options); } static int insmod(struct kmod_ctx *ctx, const char *alias, |