summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-07-31 09:50:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-07-31 09:50:26 +0000
commitfb13c58c512259986a7b96f415d0b29e3250bace (patch)
tree23fc002705d20e1197c56e8a91f7604b32c8ad2a /perl-install
parent90f12cd54fabaad6e2d36af7033e2108fc05babf (diff)
downloaddrakx-fb13c58c512259986a7b96f415d0b29e3250bace.tar
drakx-fb13c58c512259986a7b96f415d0b29e3250bace.tar.gz
drakx-fb13c58c512259986a7b96f415d0b29e3250bace.tar.bz2
drakx-fb13c58c512259986a7b96f415d0b29e3250bace.tar.xz
drakx-fb13c58c512259986a7b96f415d0b29e3250bace.zip
rescuept is no more in util-linux, so
- diskdrake: drop "Rescue partition table" feature (was based on rescuept which has been dropped in util-linux, but was quite bad compared to testdisk anyway) - rescue: remove rescuept (use testdisk instead, which is much nicer)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/diskdrake/interactive.pm7
-rw-r--r--perl-install/fsedit.pm32
-rw-r--r--perl-install/install/NEWS4
-rw-r--r--perl-install/install/share/list.xml1
5 files changed, 7 insertions, 40 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 238aa8c5c..712cb2f50 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake: drop "Rescue partition table" feature
+ (was based on rescuept which has been dropped in util-linux, but was quite
+ bad compared to testdisk anyway)
- drakauth: fix bogus string (#10776)
- drakbug:
o display Mandriva Online for mdkapplet in the "select mandriva
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 906fda5f8..7e08981e0 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -361,7 +361,6 @@ sub More {
[
{ val => N("Save partition table"), clicked_may_quit => sub { SaveInFile($in, $hd); 1 } },
{ val => N("Restore partition table"), clicked_may_quit => sub { ReadFromFile($in, $hd); 1 } },
- { val => N("Rescue partition table"), clicked_may_quit => sub { Rescuept($in, $hd); 1 } },
if_($::isInstall,
{ val => N("Reload partition table"), clicked_may_quit => sub { $r = 'force_reload'; 1 } }),
if_($::isInstall || 1,
@@ -417,12 +416,6 @@ sub SaveInFile {
}
}
-sub Rescuept {
- my ($in, $hd) = @_;
- my $_w = $in->wait_message(N("Please wait"), N("Trying to rescue partition table"));
- fsedit::rescuept($hd);
-}
-
sub Hd_info {
my ($in, $hd) = @_;
$in->ask_warn(N("Warning"), [ N("Detailed information"), format_hd_info($hd) ]);
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 3266ec5d7..61951756a 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -562,36 +562,4 @@ sub change_type {
1;
}
-sub rescuept($) {
- my ($hd) = @_;
- my ($ext, @hd);
-
- my $dev = devices::make($hd->{device});
- open(my $F, "rescuept $dev|");
- local $_;
- while (<$F>) {
- my ($st, $si, $id) = /start=\s*(\d+),\s*size=\s*(\d+),\s*Id=\s*(\d+)/ or next;
- my $part = { start => $st, size => $si };
- fs::type::set_pt_type($part, hex($id));
- if (isExtended($part)) {
- $ext = $part;
- } else {
- push @hd, $part;
- }
- }
- close $F or die "rescuept failed";
-
- partition_table::raw::zero_MBR($hd);
- foreach (@hd) {
- my $b = partition_table::verifyInside($_, $ext);
- if ($b) {
- $_->{start}--;
- $_->{size}++;
- }
- local $_->{notFormatted};
-
- partition_table::add($hd, $_, ($b ? 'Extended' : 'Primary'), 1);
- }
-}
-
1;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 7586b4515..953feea1f 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,7 @@
+- diskdrake: drop "Rescue partition table" feature
+ (was based on rescuept which has been dropped in util-linux, but was quite
+ bad compared to testdisk anyway)
+
Version 10.4.150 - 24 July 2007, by Olivier "blino" Blin
- update banner for 2008 beta 1 (from Anne)
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index d59f01363..e4b068cc4 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -5,7 +5,6 @@
cpio gzip bzip2
<if-not ARCH="ppc">
fdisk
- rescuept
</if-not>
<if ARCH="ppc">
pdisk