summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-07-15 23:29:13 +0000
committerThierry Vignaud <tv@mageia.org>2013-07-15 23:29:13 +0000
commit7df11c20cbacb39cac12d5e11a58b6f0faaa571a (patch)
tree7af15f87d79867a786091349b1cb90c51db23d29
parentce4f98ded45b33004699fb1376bce3e4de11eaa0 (diff)
adapt to latest btrfs utils for resizing
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/diskdrake/interactive.pm2
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/share/list.xml2
4 files changed, 6 insertions, 2 deletions
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) -->