Merge pull request #1248 from evelikov/deprecate-kmod

scop · web-flow · commit 36cbfc6c7e85 · 2024-11-13T19:19:42.000-01:00
Deprecate {ins,rm}mod and mod{info,probe}
diff --git a/completions/.gitignore b/completions/.gitignore
@@ -139,7 +139,7 @@
 /_incus
 /_infracost
 /inotifywatch
-/insmod.static
+/_insmod.static
 /iperf3
 /_istioctl
 /javac
diff --git a/completions/Makefile.am b/completions/Makefile.am
@@ -181,7 +181,7 @@ bashcomp_DATA = 2to3 \
 		info \
 		inject \
 		inotifywait \
-		insmod \
+		_insmod \
 		installpkg \
 		interdiff \
 		invoke-rc.d \
@@ -268,8 +268,8 @@ bashcomp_DATA = 2to3 \
 		mktemp \
 		mmsitepass \
 		_mock \
-		modinfo \
-		modprobe \
+		_modinfo \
+		_modprobe \
 		_modules \
 		monodevelop \
 		_mount \
@@ -376,7 +376,7 @@ bashcomp_DATA = 2to3 \
 		_rg \
 		ri \
 		rmlist \
-		rmmod \
+		_rmmod \
 		route \
 		rpcdebug \
 		rpm \
@@ -688,7 +688,7 @@ CLEANFILES = \
 	_incus \
 	_infracost \
 	inotifywatch \
-	insmod.static \
+	_insmod.static \
 	iperf3 \
 	_istioctl \
 	javac \
@@ -1108,8 +1108,8 @@ symlinks: $(DATA)
 		pinfo
 	$(ss) inotifywait \
 		inotifywatch
-	$(ss) insmod \
-		insmod.static
+	$(ss) _insmod \
+		_insmod.static
 	$(ss) iperf \
 		iperf3
 	$(ss) java \
diff --git a/completions/_insmod b/completions/_insmod
@@ -1,5 +1,8 @@
 # Linux insmod(8) completion                               -*- shell-script -*-
 
+# Use of this file is deprecated.
+# Upstream completion is available in kmod >= 34, use that instead.
+
 _comp_cmd_insmod()
 {
     local cur prev words cword comp_args
diff --git a/completions/_modinfo b/completions/_modinfo
@@ -1,5 +1,8 @@
 # Linux modinfo(8) completion                              -*- shell-script -*-
 
+# Use of this file is deprecated.
+# Upstream completion is expected to be available in kmod >= 35, use that instead.
+
 _comp_cmd_modinfo()
 {
     local cur prev words cword was_split comp_args
diff --git a/completions/_modprobe b/completions/_modprobe
@@ -1,5 +1,8 @@
 # Linux modprobe(8) completion                             -*- shell-script -*-
 
+# Use of this file is deprecated.
+# Upstream completion is expected to be available in kmod >= 35, use that instead.
+
 _comp_cmd_modprobe()
 {
     local cur prev words cword was_split comp_args
diff --git a/completions/_rmmod b/completions/_rmmod
@@ -1,6 +1,9 @@
 # Linux rmmod(8) completion.                               -*- shell-script -*-
 # This completes on a list of all currently installed kernel modules.
 
+# Use of this file is deprecated.
+# Upstream completion is available in kmod >= 34, use that instead.
+
 _comp_cmd_rmmod()
 {
     local cur prev words cword comp_args
diff --git a/test/fallback/completions/Makefile.am b/test/fallback/completions/Makefile.am
@@ -13,14 +13,17 @@ EXTRA_DIST = \
 	gsctl \
 	hexdump \
 	hwclock \
+	insmod \
 	ionice \
 	jungle \
 	keyring \
 	kontena \
 	look \
 	mdbook \
 	mock \
+	modinfo \
 	modules \
+	modprobe \
 	mount \
 	mount.linux \
 	newgrp \
@@ -32,6 +35,7 @@ EXTRA_DIST = \
 	renice \
 	repomanage \
 	reptyr \
+	rmmod \
 	rfkill \
 	rtcwake \
 	ruff \
diff --git a/test/fallback/completions/insmod b/test/fallback/completions/insmod
@@ -0,0 +1 @@
+../../../completions/_insmod
diff --git a/test/fallback/completions/modinfo b/test/fallback/completions/modinfo
@@ -0,0 +1 @@
+../../../completions/_modinfo
diff --git a/test/fallback/completions/modprobe b/test/fallback/completions/modprobe
@@ -0,0 +1 @@
+../../../completions/_modprobe
diff --git a/test/fallback/completions/rmmmod b/test/fallback/completions/rmmmod
@@ -0,0 +1 @@
+../../../completions/_rmmod

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`# Linux insmod(8) completion -- shell-script --`
`2`	`2`
	`3`	`+# Use of this file is deprecated.`
	`4`	`+# Upstream completion is available in kmod >= 34, use that instead.`
	`5`	`+`
`3`	`6`	`_comp_cmd_insmod()`
`4`	`7`	`{`
`5`	`8`	`local cur prev words cword comp_args`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`# Linux modinfo(8) completion -- shell-script --`
`2`	`2`
	`3`	`+# Use of this file is deprecated.`
	`4`	`+# Upstream completion is expected to be available in kmod >= 35, use that instead.`
	`5`	`+`
`3`	`6`	`_comp_cmd_modinfo()`
`4`	`7`	`{`
`5`	`8`	`local cur prev words cword was_split comp_args`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`# Linux modprobe(8) completion -- shell-script --`
`2`	`2`
	`3`	`+# Use of this file is deprecated.`
	`4`	`+# Upstream completion is expected to be available in kmod >= 35, use that instead.`
	`5`	`+`
`3`	`6`	`_comp_cmd_modprobe()`
`4`	`7`	`{`
`5`	`8`	`local cur prev words cword was_split comp_args`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
`1`	`1`	`# Linux rmmod(8) completion. -- shell-script --`
`2`	`2`	`# This completes on a list of all currently installed kernel modules.`
`3`	`3`
	`4`	`+# Use of this file is deprecated.`
	`5`	`+# Upstream completion is available in kmod >= 34, use that instead.`
	`6`	`+`
`4`	`7`	`_comp_cmd_rmmod()`
`5`	`8`	`{`
`6`	`9`	`local cur prev words cword comp_args`