summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-05-02 08:21:53 +0000
committerFrancois Pons <fpons@mandriva.com>2000-05-02 08:21:53 +0000
commitf3807275cf85b2081526cbe1a0e559e183741af3 (patch)
tree8cd91f05fbd811aa9b9a724c30e2171a9ba525fb
parente3093b811019cc0467f38b744e12ec6871a8d17e (diff)
downloaddrakx-f3807275cf85b2081526cbe1a0e559e183741af3.tar
drakx-f3807275cf85b2081526cbe1a0e559e183741af3.tar.gz
drakx-f3807275cf85b2081526cbe1a0e559e183741af3.tar.bz2
drakx-f3807275cf85b2081526cbe1a0e559e183741af3.tar.xz
drakx-f3807275cf85b2081526cbe1a0e559e183741af3.zip
*** empty log message ***
-rw-r--r--docs/TODO4
-rw-r--r--perl-install/resize_fat/any.pm1
-rw-r--r--perl-install/resize_fat/boot_sector.pm5
-rw-r--r--perl-install/resize_fat/io.pm1
4 files changed, 7 insertions, 4 deletions
diff --git a/docs/TODO b/docs/TODO
index 3a68fc51c..1833fa7f4 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -23,8 +23,6 @@ stage1 & cdrom: add ability in expert to choose the scsi cdrom drive to use
(7.1)Improved network configuration (PPP and/or Ethernet)
PPPoE install and configuration (SuSE includes it, DHCP-like)
(7.1)standalone applications for configuration (netdrake, timetool, authentificationconf, soundcard)
-(7.1) improve printerdrake to at least have the same functionalities as printtool.
-
----
(7.2 or later)horizontal sub-steps
@@ -245,6 +243,8 @@ the list is too big for USA
-done---------------------------------------------------------------------------------
+(7.1,done,fpons) improve printerdrake to at least have the same functionalities as printtool.
+
(done,fpons)diskdrake can olverlap partitions (resize lower, resize original typically
after clear all and auto allocate, try maximal size available).
diff --git a/perl-install/resize_fat/any.pm b/perl-install/resize_fat/any.pm
index 407159437..d150b142c 100644
--- a/perl-install/resize_fat/any.pm
+++ b/perl-install/resize_fat/any.pm
@@ -108,6 +108,7 @@ sub flag_clusters {
} else { return }
my $nb = resize_fat::c_rewritten::checkFat($cluster, $type, "$curr_dir_name/$entry->{name}");
+ print "resize_fat:flag_clusters: check fat returned $nb for $curr_dir_name/$entry->{name}\n";
$nb_dirs += $nb if $type == $DIRECTORY;
0;
};
diff --git a/perl-install/resize_fat/boot_sector.pm b/perl-install/resize_fat/boot_sector.pm
index 294f93a97..e7fa1c709 100644
--- a/perl-install/resize_fat/boot_sector.pm
+++ b/perl-install/resize_fat/boot_sector.pm
@@ -56,13 +56,14 @@ sub read($) {
$fs->{nb_sectors} = $fs->{small_nb_sectors} || $fs->{big_nb_sectors};
$fs->{cluster_size} = $fs->{cluster_size_in_sectors} * $fs->{sector_size};
- $fs->{boot_sign} == 0xAA55 or die "Invalid signature for a MS-based filesystem.";
- $fs->{nb_fats} == 2 or die "Weird number of FATs: $fs->{nb_fats}, not 2.",
+ $fs->{boot_sign} == 0xAA55 or die "Invalid signature for a MS-based filesystem.\n";
$fs->{nb_sectors} < 32 and die "Too few sectors for viable file system\n";
+ $fs->{nb_fats} == 2 or cdie "Weird number of FATs: $fs->{nb_fats}, not 2.\n";
$fs->{sector_size} == 512 or cdie "Strange sector_size != 512\n";
if ($fs->{fat16_fat_length}) {
#- asserting FAT16, will be verified later on
+ $resize_fat::isFAT32 = 0;
$fs->{fs_type} = 'FAT16';
$fs->{fs_type_size} = 16;
$fs->{fat_length} = $fs->{fat16_fat_length};
diff --git a/perl-install/resize_fat/io.pm b/perl-install/resize_fat/io.pm
index 2c106b87c..6543f9118 100644
--- a/perl-install/resize_fat/io.pm
+++ b/perl-install/resize_fat/io.pm
@@ -11,6 +11,7 @@ use c;
sub read($$$) {
my ($fs, $pos, $size) = @_;
+ print "reading $size bytes at $pos\n";
my $buf = "\0" x $size;
sysseek $fs->{fd}, $pos, 0 or die "seeking to byte #$pos failed on device $fs->{fs_name}";
sysread $fs->{fd}, $buf, $size or die "reading at byte #$pos failed on device $fs->{fs_name}";