diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2015-05-25 05:35:19 -0400 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-05-25 17:04:25 +0200 |
| commit | 4525579cc2f70223c3b6ffe2c977621e081f4e08 (patch) | |
| tree | db564fd07a4a0a2fc550a3531fda55ca9c36bc7e | |
| parent | d269fc99ca5de9df10c673c00c5d28063340b848 (diff) | |
| download | drakx-4525579cc2f70223c3b6ffe2c977621e081f4e08.tar drakx-4525579cc2f70223c3b6ffe2c977621e081f4e08.tar.gz drakx-4525579cc2f70223c3b6ffe2c977621e081f4e08.tar.bz2 drakx-4525579cc2f70223c3b6ffe2c977621e081f4e08.tar.xz drakx-4525579cc2f70223c3b6ffe2c977621e081f4e08.zip | |
fix not always suggesting /boot/ESP mount point
thus fixing mga#15689 for live installs
The check for whether an ESP needs to be created or not seems to prevent
us to suggest a mount point for the existing one in some cases
to be reviewed for mga6...
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index f3b9973..b222c07 100644
--- a/perl-install/fs/partitioning_wizard.pm
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/fs/partitioning_wizard.pm | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 5f9227249..1766aa618 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- library (for draklive-install): + o fix not always suggesting /boot/ESP mount point (mga#15689) - diskdrake: o set pt_type according to fs_type before flag cases (mga#16029) - localedrake: diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index f3b997377..b222c0780 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -33,6 +33,13 @@ sub partition_with_diskdrake { my ($in, $all_hds, $fstab, $manual_fstab, $_partitions, $partitioning_flags, $skip_mtab) = @_; my $ok; + # The classic installer sets $skip_mtab to either undef or 1. The live + # installer sets it to 'skip_mtab'. If $skip_mtab is not set, this has + # already been done by fs::any::get_hds. + if ($skip_mtab eq 'skip_mtab') { + fs::mount_point::suggest_mount_points_always($fstab); + } + do { $ok = 1; my $do_force_reload = sub { |