[gentoo-commits] proj/genkernel:master commit in: /, defaults/, doc/

[Thomas Deutschmann]

commit:     369cfa98f72675a285ec98439e9054ab57b234c9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 11 20:01:37 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Sep 11 20:03:24 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=369cfa98

Remove "dobtrfs" kernel command-line argument

This is no longer necessary with the switch to UDEV.

Bug: https://bugs.gentoo.org/739892
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 32 --------------------------------
 defaults/linuxrc        |  6 ------
 doc/genkernel.8.txt     |  3 ---
 genkernel               |  1 -
 4 files changed, 42 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 5181d6c..f6e84fc 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -75,7 +75,6 @@ modules_scan() {
 	elif [ "${USE_MDADM}" = '1' ] \
 		|| [ "${USE_LVM_NORMAL}" = '1' ] \
 		|| [ "${USE_CRYPTSETUP}" = '1' ] \
-		|| [ "${USE_BTRFS}" = '1' ] \
 		|| [ "${USE_ZFS}" = '1' ] \
 		|| [ "${USE_DMRAID_NORMAL}" = '1' ]
 	then
@@ -1612,25 +1611,6 @@ start_volumes() {
 		fi
 	fi
 
-	if [ "${USE_BTRFS}" = '1' ]
-	then
-		if ! hash btrfs >/dev/null 2>&1
-		then
-			bad_msg "dobtrfs invoked but 'btrfs' not found; Skipping btrfs device scanning ..."
-		else
-			good_msg "Scanning for BTRFS devices ..."
-
-			local btrfs_cmd="run btrfs device scan 2>&1"
-			is_log_enabled && btrfs_cmd="${btrfs_cmd} | tee -a '${GK_INIT_LOG}'"
-
-			eval "${btrfs_cmd}"
-			if [ $? -ne 0 ]
-			then
-				bad_msg "Scanning for BTRFS devices failed!"
-			fi
-		fi
-	fi
-
 	if [ "${USE_ZFS}" = '1' ]
 	then
 		# Avoid race involving asynchronous module loading
@@ -2510,18 +2490,6 @@ cdupdate() {
 	fi
 }
 
-setup_btrfsctl() {
-	# start BTRFS volume detection, if available
-	if hash btrfsctl >/dev/null 2>&1
-	then
-		local btrfs_cmd="run btrfsctl -a 2>&1"
-		is_log_enabled && btrfs_cmd="${btrfs_cmd} | tee -a '${GK_INIT_LOG}'"
-
-		eval "${btrfs_cmd}"
-		udevsettle
-	fi
-}
-
 rundebugshell() {
 	if is_debug
 	then

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 6d07d9b..df0f570 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -151,9 +151,6 @@ do
 				;;
 			esac
 		;;
-		dobtrfs)
-			USE_BTRFS=1
-		;;
 		quiet|quiet_genkernel)
 			QUIET=1
 		;;
@@ -615,9 +612,6 @@ fi
 # Apply scan delay if specified
 sdelay
 
-# Setup btrfs, see bug 303529
-setup_btrfsctl
-
 # Scan volumes
 start_volumes
 

diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index 5d7b74d..8909fc7 100644
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -775,9 +775,6 @@ when not set. This will allow remote user to provide answer through
     Scan for bootable ZFS pools on bootup. Optionally use cachefile or force import if
     necessary or perform both actions.
 
-*dobtrfs*::
-    Scan for attached Btrfs devices on bootup.
-
 *domultipath*::
     Activate Multipath on bootup.
 

diff --git a/genkernel b/genkernel
index 595c6ea..6ec8905 100755
--- a/genkernel
+++ b/genkernel
@@ -485,7 +485,6 @@ then
 	print_warning 1 "${BOLD}WARNING... WARNING... WARNING...${NORMAL}"
 	print_warning 1 'Additional kernel parameters that *may* be required to boot properly:'
 	isTrue "${SPLASH}"    && print_warning 1 "- Add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]"
-	isTrue "${BTRFS}"     && print_warning 1 '- Add "dobtrfs" for Btrfs device scanning support'
 	isTrue "${MULTIPATH}" && print_warning 1 '- Add "domultipath" for multipath support'
 	isTrue "${ISCSI}"     && print_warning 1 '- For iSCSI support, add at least:'
 	isTrue "${ISCSI}"     && print_warning 1 '	- "iscsi_initiatorname=<initiator name>"'