summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/install_any.pm3
-rw-r--r--perl-install/timezone.pm6
2 files changed, 3 insertions, 6 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index d2394f537..dd4441794 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -291,7 +291,7 @@ sub preConfigureTimezone {
require timezone;
#- can't be done in install cuz' timeconfig %post creates funny things
- add2hash($o->{timezone}, { timezone::read($o->{prefix}) }) if $o->{isUpgrade};
+ add2hash($o->{timezone}, timezone::read($o->{prefix})) if $o->{isUpgrade};
$o->{timezone}{timezone} ||= timezone::bestTimezone(lang::lang2text($o->{lang}));
@@ -441,7 +441,6 @@ sub setAuthentication {
my ($o) = @_;
my ($shadow, $md5, $ldap, $nis, $winbind, $winpass) = @{$o->{authentication} || {}}{qw(shadow md5 LDAP NIS winbind winpass)};
my $p = $o->{prefix};
- #- obsoleted always enabled (in /etc/pam.d/system-auth furthermore) #any::enableMD5Shadow($p, $shadow, $md5);
any::enableShadow($p) if $shadow;
if ($ldap) {
$o->pkg_install(qw(chkauth openldap-clients nss_ldap pam_ldap));
diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm
index fdcdf1aa9..3eb4fafe8 100644
--- a/perl-install/timezone.pm
+++ b/perl-install/timezone.pm
@@ -19,10 +19,8 @@ sub getTimeZones {
sub read {
my ($prefix) = @_;
- my $f = "$prefix/etc/sysconfig/clock";
- my %t = getVarsFromSh($f) or return;
-
- (timezone => $t{ZONE}, UTC => text2bool($t{UTC}));
+ my %t = getVarsFromSh("$prefix/etc/sysconfig/clock") or return {};
+ { timezone => $t{ZONE}, UTC => text2bool($t{UTC}) };
}
sub ntp_server {