summaryrefslogtreecommitdiffstats
path: root/perl-install/diskdrake/interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-02-13 16:39:58 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-02-13 16:39:58 +0000
commit7e09679225247fe5869cf15e7ea82632fc8ea037 (patch)
tree8a2f7e0e2fe0558628a79c8ccb3abc0d6b90fb94 /perl-install/diskdrake/interactive.pm
parent5a046db2174aaa509f4c27315ceabf27d106e951 (diff)
downloaddrakx-7e09679225247fe5869cf15e7ea82632fc8ea037.tar
drakx-7e09679225247fe5869cf15e7ea82632fc8ea037.tar.gz
drakx-7e09679225247fe5869cf15e7ea82632fc8ea037.tar.bz2
drakx-7e09679225247fe5869cf15e7ea82632fc8ea037.tar.xz
drakx-7e09679225247fe5869cf15e7ea82632fc8ea037.zip
try hard to update_bootloader_for_renumbered_partitions()
Diffstat (limited to 'perl-install/diskdrake/interactive.pm')
-rw-r--r--perl-install/diskdrake/interactive.pm15
1 files changed, 14 insertions, 1 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 88b959d1d..80294d42b 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -113,9 +113,10 @@ struct hd {
list will_tell_kernel # list of actions to tell to the kernel so that it knows the new partition table
bool hasBeenDirty # for undo
bool rebootNeeded # happens when a kernel reread failed
- bool partitionsRenumbered # happens when you
+ list partitionsRenumbered # happens when you
# - remove an extended partition which is not the last one
# - add an extended partition which is the first extended partition
+ list allPartitionsRenumbered # used to update bootloader configuration
int bus, id
partition_table_elem primary
@@ -270,6 +271,8 @@ sub Done {
$all_hds->{current_fstab} = $new;
fs::write_fstab($all_hds);
}
+ update_bootloader_for_renumbered_partitions($in, $all_hds);
+
if (any { $_->{rebootNeeded} } @{$all_hds->{hds}}) {
$in->ask_warn('', N("You need to reboot for the partition table modifications to take place"));
tell_wm_and_reboot();
@@ -1119,6 +1122,8 @@ sub warn_if_renumbered {
my $l = delete $hd->{partitionsRenumbered};
return if is_empty_array_ref($l);
+ push @{$hd->{allPartitionsRenumbered}}, @$l;
+
my @l = map {
my ($old, $new) = @$_;
N("partition %s is now known as %s", $old, $new) } @$l;
@@ -1279,3 +1284,11 @@ sub tell_wm_and_reboot() {
), $wm, $pid;
}
}
+
+sub update_bootloader_for_renumbered_partitions {
+ my ($in, $all_hds) = @_;
+ my @renumbering = map { @{$_->{allPartitionsRenumbered} || []} } @{$all_hds->{hds}} or return;
+
+ require bootloader;
+ bootloader::update_for_renumbered_partitions($in, \@renumbering);
+}