diff options
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 10 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/share/list.xml | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 63ecd698f..bfc10441a 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -2,6 +2,7 @@ - recognize new kernel 5.2 - 5.4 drivers - diskdrake: o add support for F2FS + o enable to resize NILFS2 o enhanced internal doc o make reformating nilfs2 fses to work o support adding partitions to Live ISOs on USB sticks (mga#25224) diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index 511a2660b..8cc82d099 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -397,7 +397,7 @@ sub Hd_info { sub is_LVM_resizable { my ($part) = @_; - member($part->{fs_type}, qw(btrfs ext3 ext4 reiserfs xfs)); + member($part->{fs_type}, qw(btrfs ext3 ext4 nilfs2 reiserfs xfs)); } sub part_possible_actions { my ($_in, $hd, $part, $all_hds) = @_; @@ -829,10 +829,12 @@ sub Resize { } elsif ($part->{fs_type} eq 'xfs' && isLVM($hd) && $::isStandalone && $part->{isMounted}) { $min = $part->{size}; #- ensure the user can only increase $nice_resize{xfs} = 1; - } elsif ($part->{fs_type} eq 'btrfs') { + } elsif (member($part->{fs_type}, qw(btrfs nilfs2))) { $online_resize = $part->{fs_type}; } + # Btrf & nilfs only support online resizing + # (Ext3/4 too but we can resize it offline so we don't care - though growing online is interesting) if ($online_resize) { write_partitions($in, $hd) or return; $nice_resize{$online_resize} = 1; @@ -920,6 +922,8 @@ filesystem checks will be run on your next boot into Microsoft Windows®")); my @cmd; if ($nice_resize{btrfs}) { @cmd = (qw(btrfs filesystem resize), $part->{size}*512, $dir); + } elsif ($nice_resize{nilfs2}) { + @cmd = ('nilfs-resize', devices::make($part->{device}), $part->{size}*512); } if (!run_program::run(@cmd)) { $nice_resize{$part->{fs_type}} = undef; @@ -931,8 +935,6 @@ filesystem checks will be run on your next boot into Microsoft Windows®")); } } elsif ($nice_resize{f2fs}) { run_program::run_or_die("resize.f2fs", devices::make($part->{device})); - } elsif ($nice_resize{nilfs}) { - run_program::run_or_die("nilfs-resize", devices::make($part->{device})); } if (%nice_resize) { diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index da7754c4b..10124562b 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,6 +1,7 @@ - adjust debug build to current python - partitioning: o enable to install on F2FS formated partitions + o enable to resize NILFS2 o enable to resize XFS during install - recognize new kernel 5.5 drivers diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 169a941fd..733ea7154 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -28,7 +28,7 @@ mkfs.btrfs btrfs btrfsck fsck.btrfs btrfstune mkfs.f2fs fsck.f2fs resize.f2fs mkfs.jfs fsck.jfs jfs_tune - mkfs.nilfs2 nilfs-tune + mkfs.nilfs2 nilfs-tune nilfs-resize tty stty <!-- needed for text mode installer (through unicode_start) --> |