summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/ChangeLog5
-rw-r--r--perl-install/install_steps.pm2
-rw-r--r--perl-install/partition_table.pm2
3 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 69a25fd48..42aa57538 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-24 Pixel <pixel@mandrakesoft.com>
+
+ * modules.pm (mergein_conf): created. call read_conf, fills
+ %modules::conf and set $modules::scsi
+
2000-09-24 Guillaume Cottenceau <gc@mandrakesoft.com>
* standalone/drakgw (fatal_quit($)): add log of reason of fatal_quit
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index ab087233a..18a188a73 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -132,7 +132,7 @@ sub doPartitionDisksBefore {
eval { fs::umount("/tmp/hdimage") };
}
eval {
- close pkgs::LOG;
+ close *pkgs::LOG;
eval { fs::umount("$o->{prefix}/proc") };
eval { fs::umount_all($o->{fstab}, $o->{prefix}) };
eval { sleep 1; fs::umount_all($o->{fstab}, $o->{prefix}) } if $@; #- HACK
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index e1b5b796a..c1f90c566 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -486,7 +486,7 @@ sub active($$) {
$_->{active} = 0 foreach @{$hd->{primary}{normal}};
$part->{active} = 0x80;
- hd->{isDirty} = 1;
+ $hd->{isDirty} = 1;
}