--- loncom/build/make_domain_coordinator.pl 2012/12/18 13:05:41 1.24 +++ loncom/build/make_domain_coordinator.pl 2021/01/08 00:38:07 1.28 @@ -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.24 2012/12/18 13:05:41 raeburn Exp $ +# $Id: make_domain_coordinator.pl,v 1.28 2021/01/08 00:38:07 raeburn Exp $ # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). # @@ -97,6 +97,7 @@ use Apache::lonnet; use Apache::lonlocal; use DBI; use Storable qw(nfreeze); +use Sys::Hostname::FQDN(); use strict; =pod @@ -360,12 +361,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 { @@ -528,7 +540,7 @@ by going to http://MACHINENAME/adm/creat # Output success message, and inform sysadmin about how to further proceed. print("\n".&mt('[_1] is now a domain coordinator',$username)."\n"); # Output success message. -my $hostname=`hostname`; chomp($hostname); # Read in hostname. +my $hostname = Sys::Hostname::FQDN::fqdn(); # Read in hostname. print("\n". &mt('Once LON-CAPA is running, you should log-in and use: [_1] to further define this user.', "\nhttp://$hostname/adm/createuser\n")."\n\n".