gen_initramfs, initrd.scripts: migrate to /sbin/btrfs

btrfsctl is deprecated.
12 years ago · 12af5dfd3a
parent c27d3ac25d
commit 12af5dfd3a
2 changed files with 2 additions and 2 deletions
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@ -1380,7 +1380,7 @@ cdupdate() {

 setup_btrfsctl() {
 	# start BTRFS volume detection, if available
-	[ -x /sbin/btrfsctl ] && /sbin/btrfsctl -a
+	[ -x /sbin/btrfs ] && /sbin/btrfs device scan
 }

 setup_md_device() {
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@ -372,7 +372,7 @@ append_btrfs() {
 	fi

 	# Copy binaries
-	copy_binaries "${TEMP}/initramfs-btrfs-temp" /sbin/{btrfs,btrfsctl}
+	copy_binaries "${TEMP}/initramfs-btrfs-temp" /sbin/btrfs

 	cd "${TEMP}/initramfs-btrfs-temp/"
 	log_future_cpio_content