summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-05 23:39:24 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-05 23:39:24 +0000
commitc6579c318fe88bed42452140ddcc6f31a2b78103 (patch)
tree8f0deea47e32c109b1dbc05cc30dce477fcc8837 /perl-install
parentd72f07a5fcb1614f2450a2fd74d07274d21f23ad (diff)
downloaddrakx-c6579c318fe88bed42452140ddcc6f31a2b78103.tar
drakx-c6579c318fe88bed42452140ddcc6f31a2b78103.tar.gz
drakx-c6579c318fe88bed42452140ddcc6f31a2b78103.tar.bz2
drakx-c6579c318fe88bed42452140ddcc6f31a2b78103.tar.xz
drakx-c6579c318fe88bed42452140ddcc6f31a2b78103.zip
(generate_automatic_stage1_params): replace generate_ks_cfg
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_any.pm32
1 files changed, 21 insertions, 11 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index aa31f1489..ce906d48b 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -607,27 +607,37 @@ sub loadO {
bless $o, ref $O;
}
-sub generate_ks_cfg {
+sub generate_automatic_stage1_params {
my ($o) = @_;
return if $o->{method} =~ /hd|cdrom/;
- my $ks;
- if ($o->{method} =~ /ftp|http/) {
- $ks .= "url --url $ENV{URLPREFIX}\n";
+ my $ks = "automatic=";
+
+ if ($o->{method} =~ /hd/) {
+ $ks .= "method:disk,";
+ } else {
+ $ks .= "method:" . $o->{method} . ",";
+ }
+
+ if ($o->{method} =~ /http/) {
+ "$ENV{URLPREFIX}" =~ m|http://(.*)/(.*)| or die;
+ $ks .= "server:$1,directory:$2,";
+ } elsif ($o->{method} =~ /ftp/) {
+ $ks .= "server:$ENV{HOST},directory:$ENV{PREFIX},user:$ENV{LOGIN},pass:$ENV{PASSWORD},";
} elsif ($o->{method} =~ /nfs/) {
cat_("/proc/mounts") =~ m|(\S+):(\S+)\s+/tmp/image nfs| or die;
- $ks .= "nfs --server $1 --dir $2\n";
+ $ks .= "server:$1,directory:$2,";
}
+
my ($intf) = values %{$o->{intf}};
- if ($intf->{BOOTPROTO} =~ /^(dhcp|bootp)$/) {
- $ks .= "network --bootproto $intf->{BOOTPROTO}\n";
+ if ($intf->{BOOTPROTO} =~ /dhcp/) {
+ $ks .= "network:dhcp,";
} else {
require network;
- my %l = (ip => $intf->{IPADDR}, netmask => $intf->{NETMASK}, gateway => $o->{netc}{GATEWAY});
- $ks .= "network " . join(" ", map_each { $::b && "--$::a $::b" } %l);
- $ks .= " --nameserver $_" foreach network::dnsServers($o->{netc});
- $ks .= "\n";
+ $ks .= "ip:$intf->{IPADDR},netmask:$intf->{NETMASK},gateway:$o->{netc}{GATEWAY},";
+ my @dnss = network::dnsServers($o->{netc});
+ $ks .= "dns:$dnss[0]," if @dnss;
}
$ks;
}