tools/modprobe: Fix odd --remove-holders behavior

--remove-holders was not implying --remove, which means that if the user
called `modprobe --remove-holders xe` it would actually try to insert
the xe module. Fix it and spell it out in the man page about one option
implying the other.

Considering i915 is not currently loaded:

Before:
	kmod $ ./build/modprobe -v --dry-run --remove-holders i915
	insmod /lib/modules/6.14.11-1-MANJARO/kernel/drivers/char/agp/intel-gtt.ko.zst
	insmod /lib/modules/6.14.11-1-MANJARO/kernel/drivers/gpu/drm/i915/i915.ko.zst
	kmod $

After:
	kmod $ ./build/modprobe -v --dry-run --remove-holders i915
	kmod $

Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/372
(cherry picked from commit 15edeed38680c7ab5cfa2717b1721e3e51e41e33)
[ Conflicts:
	man/modprobe.8.scd ]
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>

diff --git a/tools/modprobe.c b/tools/modprobe.c
index b172e97e4876872e57a23e65b7f1c91f5c6cb3c2..bc3ded98e11f5d7707c348fc33c982a071c83c5e 100644 (file)
--- a/tools/modprobe.c
+++ b/tools/modprobe.c
@@ -787,6 +787,7 @@ static int do_modprobe(int argc, char **orig_argv)
                        break;
                case 5:
                        remove_holders = 1;
+                       do_remove = 1;
                        break;
                case 'w': {
                        char *endptr = NULL;