summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-04-10 21:39:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-04-10 21:39:26 +0000
commitde19160a9fc5d7021ce5b9ab516e5af72b3f394e (patch)
treec7ffe589cd6fee23cd298737ff9cbccdaaef5c88
parentf8ce98a9ff2c26b6b7e613e4c994382c509aa630 (diff)
downloaddrakx-backup-do-not-use-de19160a9fc5d7021ce5b9ab516e5af72b3f394e.tar
drakx-backup-do-not-use-de19160a9fc5d7021ce5b9ab516e5af72b3f394e.tar.gz
drakx-backup-do-not-use-de19160a9fc5d7021ce5b9ab516e5af72b3f394e.tar.bz2
drakx-backup-do-not-use-de19160a9fc5d7021ce5b9ab516e5af72b3f394e.tar.xz
drakx-backup-do-not-use-de19160a9fc5d7021ce5b9ab516e5af72b3f394e.zip
no_comment
-rw-r--r--docs/TODO2
-rw-r--r--perl-install/fsedit.pm5
-rw-r--r--perl-install/interactive_gtk.pm2
-rw-r--r--perl-install/partition_table.pm8
4 files changed, 13 insertions, 4 deletions
diff --git a/docs/TODO b/docs/TODO
index 00143524c..8b2cc7873 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,4 +1,6 @@
-URGENT---------------------------------------------------------------------------------
+group selectiopn doesn't do anything
+
check for fpons/pixel BOTH that resize_fat is clean for current version
relative to 7.0-2.
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 6cf4bd17b..7dc79e6d9 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -74,6 +74,11 @@ sub hds($$) {
cdie($@) unless $flags->{eraseBadPartitions};
partition_table_raw::zero_MBR($hd);
}
+ #- special case for type overloading (eg: reiserfs is 0x183)
+ foreach (grep { isExt2($_) } partition_table::get_normal_parts($hd)) {
+ my $type = typeOfPart($_->{device});
+ $_->{type} = $type if $type > 0x100;
+ }
push @hds, $hd;
}
[ @hds ];
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index 5e4764f7b..7202b96ac 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -117,7 +117,7 @@ sub ask_from_treelistW {
gtkadd($w->{window},
gtkpack($w->create_box_with_title(@$messages),
gtkpack_(new Gtk::VBox(0,7),
- 1, gtkset_usize(createScrolledWindow($tree), 300, min(400, $::windowheight - 60)),
+ 1, gtkset_usize(createScrolledWindow($tree), 300, min(350, $::windowheight - 60)),
0, $w->create_okcancel)));
$tree->set_column_auto_resize(0, 1);
$tree->set_selection_mode('browse');
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 68cedfe13..0d9da9cee 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -21,7 +21,7 @@ use partition_table_mac;
use log;
-@important_types = ('Linux native', 'Linux swap', 'DOS FAT16', 'Win98 FAT32', 'Linux RAID');
+@important_types = ('Linux native', 'ReiserFS', 'Linux swap', 'DOS FAT16', 'Win98 FAT32', 'Linux RAID');
@fields2save = qw(primary extended totalsectors);
@@ -31,8 +31,9 @@ my %types = (
arch() =~ /^ppc/ ? (
0x401 => 'Apple Partition',
0x402 => 'Apple HFS Partition',
-) : (),
-arch() =~ /^sparc/ ? (
+) : (
+ 0x183 => 'ReiserFS',
+), arch() =~ /^sparc/ ? (
0x1 => 'SunOS boot',
0x2 => 'SunOS root',
0x3 => 'SunOS swap',
@@ -177,6 +178,7 @@ arch() !~ /^sparc/ ? (
0x1e => 'vfat',
0x82 => 'swap',
0x83 => 'ext2',
+ 0x183=> 'reiserfs',
0x402 => 'hfs',
nfs => 'nfs', #- hack
);