--- loncom/build/make_domain_coordinator.pl 2012/11/20 19:00:52 1.23 +++ loncom/build/make_domain_coordinator.pl 2015/01/03 02:45:22 1.27 @@ -11,7 +11,7 @@ make_domain_coordinator.pl - Make a doma # The LearningOnline Network # make_domain_coordinator.pl - Make a domain coordinator on a system # -# $Id: make_domain_coordinator.pl,v 1.23 2012/11/20 19:00:52 raeburn Exp $ +# $Id: make_domain_coordinator.pl,v 1.27 2015/01/03 02:45:22 raeburn Exp $ # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). # @@ -210,7 +210,7 @@ while ((!$got_passwd) && ($trial < $maxt foreach (split(//,$firstpass)) {if ((ord($_)<32)||(ord($_)>126)){$pbad=1;}} if ($pbad) { print(&mt('Password contains invalid characters.')."\n". - &mt('Password must consist of standard ASCII characters')."\n". + &mt('Password must consist of standard ASCII characters.')."\n". &mt('Please try again.')."\n"); } else { $secondpass = &get_password(&mt('Enter password a second time')); @@ -360,12 +360,23 @@ if ($pbad) { "\n"); } -my $distro; +my ($distro,$nostdin); if (open(PIPE,"perl distprobe|")) { $distro = ; close(PIPE); } if ($distro =~ /^ubuntu|debian/) { + $nostdin = 1; +} elsif ($distro =~ /^suse([\d.]+)$/) { + if ($1 > 12.2) { + $nostdin = 1; + } +} elsif ($distro =~ /^sles(\d+)$/) { + if ($1 > 11) { + $nostdin = 1; + } +} +if ($nostdin) { open(OUT,"|usermod -p `mkpasswd $passwd` $username"); close(OUT); } else { @@ -444,7 +455,7 @@ use GDBM_File; # A simplistic key-value my $rolesref=&LONCAPA::locking_hash_tie("$udpath/roles.db",&GDBM_WRCREAT()); if (!$rolesref) { print(&mt('Error').' '. - &mt('unable to tie roles db: [_1]'."$udpath/roles.db")."\n"); + &mt('unable to tie roles db: [_1].',"$udpath/roles.db")."\n"); exit; } my $now = time;