summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2000-10-03 17:08:40 +0000
committerdamien <damien@mandriva.com>2000-10-03 17:08:40 +0000
commit5fbdc963b632b1d8c8ac3a14728b749f4d03b075 (patch)
tree588186fa38f0699dedbf52a4b71da8cd1070fb89
parent47fa718f75c70160233787be83e5e322476a9a03 (diff)
downloaddrakx-backup-do-not-use-5fbdc963b632b1d8c8ac3a14728b749f4d03b075.tar
drakx-backup-do-not-use-5fbdc963b632b1d8c8ac3a14728b749f4d03b075.tar.gz
drakx-backup-do-not-use-5fbdc963b632b1d8c8ac3a14728b749f4d03b075.tar.bz2
drakx-backup-do-not-use-5fbdc963b632b1d8c8ac3a14728b749f4d03b075.tar.xz
drakx-backup-do-not-use-5fbdc963b632b1d8c8ac3a14728b749f4d03b075.zip
updated
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/network.pm1
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index e2d27ba8e..a269393ce 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -242,7 +242,7 @@ sub setAutologin {
if ($user) {
local *F;
open F, ">$prefix/etc/sysconfig/desktop" or die "Can't open $!";
- print F uc($desktop);
+ print F uc($desktop) . "\n";
close F;
}
setVarsInSh("$prefix/etc/sysconfig/autologin",
diff --git a/perl-install/network.pm b/perl-install/network.pm
index c4818e758..598949fff 100644
--- a/perl-install/network.pm
+++ b/perl-install/network.pm
@@ -265,6 +265,7 @@ sub configureNetwork {
#- my $wait = $o->wait_message(_("Hostname"), _("Determining host name and domain..."));
#- network::guessHostname($o->{prefix}, $o->{netc}, $o->{intf});
#- }
+ $last or return;
if ($last->{BOOTPROTO} =~ /^(dhcp|bootp)$/) {
my $dhcp_hostname = $netc->{HOSTNAME};
$::isInstall and $in->set_help('configureNetworkHostDHCP');