From c3f114b71ee06f5f359566e46c190eebc1d895c0 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Mon, 15 Jul 2013 23:29:13 +0000
Subject: adapt to latest btrfs utils for resizing

---
 perl-install/NEWS                     | 2 ++
 perl-install/diskdrake/interactive.pm | 2 +-
 perl-install/install/NEWS             | 2 ++
 perl-install/install/share/list.xml   | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index be77612b3..b93a622de 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- adapt to latest btrfs utils for resizing
+
 Version 15.56 - 16 July 2013
 
 - detect wifi cards managed by bcma driver (mga#9378)
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 011d61422..212d98b7a 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -893,7 +893,7 @@ filesystem checks will be run on your next boot into Microsoft Windows®"));
 	    mkdir_p($dir);
 	    fs::mount::mount(devices::make($part->{device}), $dir, $part->{fs_type});
 	}
-	if (!run_program::run("btrfsctl", "-r", $part->{size}*512, $dir)) {
+	if (!run_program::run(qw(btrfs filesystem resize), $part->{size}*512, $dir)) {
 	    $nice_resize{btrfs} = undef;
 	    if (!$part->{isMounted}) {
 		fs::mount::umount($dir);
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a57ff9f43..963c60f1b 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- adapt to latest btrfs utils for resizing
+
 Version 15.56 - 16 July 2013
 
 - bootloader:
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index d496e5a28..904a5532e 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -26,7 +26,7 @@
   mkfs.xfs xfs_admin
   xfs_freeze xfs_io <!-- needed for setup grub on XFS formated / -->
 
-  mkfs.btrfs btrfsctl btrfs btrfsck fsck.btrfs
+  mkfs.btrfs btrfs btrfsck fsck.btrfs
   mkfs.nilfs2 nilfs-tune
 
   tty stty <!-- needed for text mode installer (through unicode_start) -->
-- 
cgit v1.2.1