From d157c06993b22ebc4b82baa360ccc3816646089f Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 3 Apr 2000 21:54:16 +0000
Subject: no_comment

---
 perl-install/ChangeLog        | 4 ++++
 perl-install/fs.pm            | 7 +++++++
 perl-install/install_any.pm   | 2 ++
 perl-install/install_steps.pm | 2 +-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 226de0eb3..e3ab8d249 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-03  Pixel  <pixel@mandrakesoft.com>
+
+	* fs.pm (format_ext2): add options "-b 1024 -O none" for alpha
+
 2000-03-31  François Pons  <fpons@mandrakesoft.com>
 
 	* install_steps_gtk.pm: made changeMedium sub modification
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 43b88e69d..cf6ed3ebf 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -80,6 +80,7 @@ sub format_ext2($@) {
     my ($dev, @options) = @_;
 
     $dev =~ m,(rd|ida)/, and push @options, qw(-b 4096 -R stride=16); #- For RAID only.
+    push @options, qw(-b 1024 -O none) if arch() =~ /alpha/;
 
     run_program::run("mke2fs", @options, devices::make($dev)) or die _("%s formatting of %s failed", "ext2", $dev);
 }
@@ -367,6 +368,12 @@ sub write_fstab($;$$) {
     print F join(" ", @$_), "\n" foreach sort { $a->[1] cmp $b->[1] } @to_add;
 }
 
+sub merge_fstabs {
+    my ($fstab, $manualFstab) = @_;
+    my %l; $l{$_->{device}} = $_ foreach @$manualFstab;
+    add2hash_($_, $l{$_->{device}} || next) foreach @$fstab;
+}
+
 #sub check_mount_all_fstab($;$) {
 #    my ($fstab, $prefix) = @_;
 #    $prefix ||= '';
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index d7e22cce1..3bcaecb44 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -303,6 +303,7 @@ I'll try to go on blanking bad partitions"), $err]) unless $o->{partitioning}{re
     ($o->{hds}, $o->{fstab}, $ok2) = fsedit::verifyHds($o->{hds}, $o->{partitioning}{readonly}, $ok);
 
     fs::check_mounted($o->{fstab});
+    fs::merge_fstabs($o->{fstab}, $o->{manualFstab});
 
     $o->{partitioning}{clearall} and return 1;
     $o->ask_warn('', 
@@ -624,6 +625,7 @@ sub install_urpmi {
 	local *FILES; open FILES, "bzip2 -dc /tmp/$_->{hdlist} 2>/dev/null | hdlist2names - |";
 	chop, print LIST "$dir/$_\n" foreach <FILES>;
 	close FILES or log::l("hdlist2names failed"), return;
+	close LIST;
 
 	$dir .= " with ../base/$_->{hdlist}" if $method =~ /ftp|http/;
 	"$name $dir\n";
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 34f18407e..bc4d623f3 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -375,7 +375,7 @@ sub configureNetwork($) {
     network::sethostname($o->{netc}) unless $::testing;
     network::addDefaultRoute($o->{netc}) unless $::testing;
 
-    install_any::pkg_install($o, "dhcpcd") if grep { $_->{BOOTPROTO} =~ /^(dhcp|bootp)$/ } @{$o->{intf}};
+    install_any::pkg_install($o, "dhcpxd") if grep { $_->{BOOTPROTO} =~ /^(dhcp|bootp)$/ } @{$o->{intf}};
     # Handle also pump (this is still in initscripts no?)
     install_any::pkg_install($o, "pump") if grep { $_->{BOOTPROTO} =~ /^(pump)$/ } @{$o->{intf}};
     #-res_init();		#- reinit the resolver so DNS changes take affect
-- 
cgit v1.2.1