summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2002-03-12 20:45:20 +0000
committerdamien <damien@mandriva.com>2002-03-12 20:45:20 +0000
commite0ec77fdf3ff939f17fcc8f1a00623ac5a6de7e1 (patch)
tree2978ce9137df0339f8bae5506c8fbb2eb309ccbf
parent3148d30c49277f0f55feac4ee65f499138af8ba0 (diff)
downloaddrakx-backup-do-not-use-e0ec77fdf3ff939f17fcc8f1a00623ac5a6de7e1.tar
drakx-backup-do-not-use-e0ec77fdf3ff939f17fcc8f1a00623ac5a6de7e1.tar.gz
drakx-backup-do-not-use-e0ec77fdf3ff939f17fcc8f1a00623ac5a6de7e1.tar.bz2
drakx-backup-do-not-use-e0ec77fdf3ff939f17fcc8f1a00623ac5a6de7e1.tar.xz
drakx-backup-do-not-use-e0ec77fdf3ff939f17fcc8f1a00623ac5a6de7e1.zip
corrected domainname bug; added onboot option
-rw-r--r--perl-install/network/network.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 37b20b40b..c4ecba911 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -68,7 +68,7 @@ sub write_conf {
my ($file, $netc) = @_;
if ($netc->{HOSTNAME}) {
- $netc->{HOSTNAME} =~ /^[^\.]\.(.*)$/;
+ $netc->{HOSTNAME} =~ /\.(.*)$/;
$1 and $netc->{DOMAINNAME} = $1;
}
($netc->{DOMAINNAME}) ||= 'localdomain';
@@ -301,6 +301,7 @@ notation (for example, 1.2.3.4).");
my $pump = $intf->{BOOTPROTO} =~ /^(dhcp|bootp)$/;
delete $intf->{NETWORK};
delete $intf->{BROADCAST};
+ my $onboot = 1;
my @fields = qw(IPADDR NETMASK);
$::isStandalone or $in->set_help('configureNetworkIP');
$in->ask_from(_("Configuring network device %s", $intf->{DEVICE}),
@@ -309,6 +310,7 @@ notation (for example, 1.2.3.4).");
[ { label => _("IP address"), val => \$intf->{IPADDR}, disabled => sub { $pump } },
{ label => _("Netmask"), val => \$intf->{NETMASK}, disabled => sub { $pump } },
{ label => _("Automatic IP"), val => \$pump, type => "bool", text => _("(bootp/dhcp)") },
+ { label => _("Started at boot"), val => \$onboot, type => "bool" },
if_($intf->{wireless_eth},
{ label => "WIRELESS_MODE", val => \$intf->{WIRELESS_MODE}, list => [ "Ad-hoc", "Managed", "Master", "Repeater", "Secondary", "Auto"] },
{ label => "WIRELESS_ESSID", val => \$intf->{WIRELESS_ESSID} },
@@ -347,6 +349,7 @@ notation (for example, 1.2.3.4).");
$intf->{NETMASK} ||= netmask($intf->{IPADDR}) unless $_[0]
}
);
+ $intf->{ONBOOT} = bool2yesno($onboot);
}
sub configureNetworkNet {