mi-bug-report: Allow to use kernel modules from the host system

Signed-off-by: Alexey Gladkov <[email protected]>

Author: legionus

utils/mi-bug-report

@@ -27,9 +27,10 @@ show_help() {
 	Usage: $PROG [<option>] <report-archive> [<command> [<args>]]
 
 	Options:
-	   -v, --verbose          print a message for each action;
-	   -V, --version          output version information and exit;
-	   -h, --help             display this help and exit.
+	   -k, --set-version=VERSION   use kernel VERSION.
+	   -v, --verbose               print a message for each action;
+	   -V, --version               output version information and exit;
+	   -h, --help                  display this help and exit.
 
 	Report bugs to authors.
 
@@ -38,12 +39,17 @@ show_help() {
 }
 
 if [ -z "${__BUG_REPORT-}" ]; then
-	TEMP=`getopt -n "$PROG" -o 'h,v,V' -l 'help,verbose,version' -- "$@"` ||
+	TEMP=`getopt -n "$PROG" -o 'k:,h,v,V' -l 'set-version:,help,verbose,version' -- "$@"` ||
 		show_usage
 	eval set -- "$TEMP"
 
+	kver=
+
 	while :; do
 		case "$1" in
+			-k|--set-version) shift
+				kver="$1"
+				;;
 			-h|--help)
 				show_help
 				;;
@@ -84,7 +90,7 @@ if [ -z "${__BUG_REPORT-}" ]; then
 
 	verbose "making new namespace ..."
 
-	export verbose
+	export verbose kver
 	export __BUG_REPORT=1
 	export __BUG_REPORT_ARCHIVE="$archive"
 	export __BUG_REPORT_PWD="$PWD"
@@ -161,6 +167,11 @@ else
 		[ -f etc/initrd.mk ] || printf > etc/initrd.mk 'AUTODETECT = all\n'
 	}
 
+	if [ -n "$kver" ]; then
+		mkdir -p -- "/tmp/_$kver"
+		mount --bind "/lib/modules/$kver" "/tmp/_$kver"
+	fi
+
 	# We overlap the system directories with prepared directories from the
 	# bug report.
 	find . -mindepth 1 -maxdepth 1 -type d -printf './%f /%f\n' |
@@ -183,6 +194,11 @@ else
 		mount $verbose --rbind "$src" "$dst"
 	done
 
+	if [ -n "$kver" ]; then
+		mkdir -p -- "/lib/modules/$kver"
+		mount --move "/tmp/_$kver" "/lib/modules/$kver"
+	fi
+
 	mkdir -p -- "$workdir"/bin
 	cat > "$workdir"/bin/procfs <<-'EOF'
 	#!/bin/bash -efu
@@ -209,9 +225,11 @@ else
 	alias l='ls -la'
 	EOF
 
-	[ -d lib/modules ] &&
-		kver=$(find lib/modules/ -mindepth 1 -maxdepth 1 -printf '%f' -quit ||:) ||
-		kver=$(uname -r)
+	if [ -z "$kver" ]; then
+		[ -d lib/modules ] &&
+			kver=$(find lib/modules/ -mindepth 1 -maxdepth 1 -printf '%f' -quit ||:) ||
+			kver=$(uname -r)
+	fi
 
 	kmodules="$(find "/lib/modules/$kver/kernel" -name '*.ko*' -print -quit 2>/dev/null ||:)"
 	[ -n "$kmodules" ] ||