summaryrefslogtreecommitdiffstats
path: root/perl-install/fs
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2020-04-16 03:40:17 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2020-04-23 15:16:26 +0200
commit2eba0d7dcd799c3e220dcb4ee22b43b88baec16f (patch)
tree5b25e35f9dd122a8c109c92c58bec141796f3ca7 /perl-install/fs
parent46242d22e7850039385fd26105442cd0b23e6152 (diff)
downloaddrakx-2eba0d7dcd799c3e220dcb4ee22b43b88baec16f.tar
drakx-2eba0d7dcd799c3e220dcb4ee22b43b88baec16f.tar.gz
drakx-2eba0d7dcd799c3e220dcb4ee22b43b88baec16f.tar.bz2
drakx-2eba0d7dcd799c3e220dcb4ee22b43b88baec16f.tar.xz
drakx-2eba0d7dcd799c3e220dcb4ee22b43b88baec16f.zip
Move disabling fsck back into part_raw()
It's more logical. It had been moved to preserve_UUID_after_format() when it got split in commit 01c03167421615cbfbe6c6f626fed22ac6e0992c
Diffstat (limited to 'perl-install/fs')
-rw-r--r--perl-install/fs/format.pm9
1 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index 9ca2ec754..13d318cc0 100644
--- a/perl-install/fs/format.pm
+++ b/perl-install/fs/format.pm
@@ -289,6 +289,11 @@ sub part_raw {
delete $part->{device_LABEL_changed};
preserve_UUID_after_format($dev, $part, $fs_type);
+
+ if (member($fs_type, qw(ext3 ext4))) {
+ disable_forced_fsck($dev);
+ }
+
after_formatting($part);
}
@@ -306,10 +311,6 @@ sub preserve_UUID_after_format {
} elsif ($fs_type eq 'btrfs' && $part->{device_UUID}) {
write_btrfs_uuid($part->{device_UUID}, $dev);
}
-
- if (member($fs_type, qw(ext3 ext4))) {
- disable_forced_fsck($dev);
- }
}
=item after_formatting($part)