summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-01-30 11:18:58 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-01-30 11:18:58 +0000
commitd6b267e25610b648ea95997db639dbac9d294a49 (patch)
treebe1ffe9854d40a525cb28b0b5f8d3d809369193c
parent12ec0e6bcf5c7bf794d66ac2f3fbdaebd25082d5 (diff)
downloaddrakx-d6b267e25610b648ea95997db639dbac9d294a49.tar
drakx-d6b267e25610b648ea95997db639dbac9d294a49.tar.gz
drakx-d6b267e25610b648ea95997db639dbac9d294a49.tar.bz2
drakx-d6b267e25610b648ea95997db639dbac9d294a49.tar.xz
drakx-d6b267e25610b648ea95997db639dbac9d294a49.zip
- tell kernel to remove the extended partition
- true/false is better than yes/no in log message
-rw-r--r--perl-install/partition_table.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index a92b949ca..6d7e519ae 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -440,6 +440,7 @@ sub adjust_main_extended {
$l->{size} = $hd->{primary}{extended}{size} = $end - $start;
}
if (!@{$hd->{extended} || []} && $hd->{primary}{extended}) {
+ will_tell_kernel($hd, del => $hd->{primary}{extended});
%{$hd->{primary}{extended}} = (); #- modify the raw entry
delete $hd->{primary}{extended};
}
@@ -626,7 +627,7 @@ sub tell_kernel {
} elsif ($action eq 'del') {
$force_reboot ||= !c::del_partition(fileno $F, $part_number);
}
- log::l("tell kernel $action ($part_number $o_start $o_size), rebootNeeded is now " . bool2yesno($hd->{rebootNeeded}));
+ log::l("tell kernel $action ($part_number $o_start $o_size), rebootNeeded is now " . bool2text($hd->{rebootNeeded}));
}
}
if ($force_reboot) {