From 12af5dfd3ac2c0bc3f3f78aff6bf284a93738048 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 18 Aug 2013 13:35:08 +0200 Subject: [PATCH] gen_initramfs, initrd.scripts: migrate to /sbin/btrfs btrfsctl is deprecated. --- defaults/initrd.scripts | 2 +- gen_initramfs.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 3007fbc..b3a9e20 100644 --- 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() { diff --git a/gen_initramfs.sh b/gen_initramfs.sh index d5f0597..724af3b 100755 --- 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