michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix earlier introduced bugs for Solaris systems

Browse Source
This commit is contained in:
iliajie
2022-07-07 17:44:20 +03:00
parent 3bb6b0b992
commit ceb3f4b669
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webmin/upgrade.cgi
View File

@@ -329,7 +329,10 @@ elsif ($in{'mode'} eq 'solaris-pkg' || $in{'mode'} eq 'sun-pkg') {
# package. It would be interesting, however, if this were embedded in
# a remote script that could be nohup'd and it would restart the server.
chdir("/");
&restart_miniserv();
my $pre_install_script = "$config_directory/.pre-install";
my $stop_script = -r $pre_install_script ? $pre_install_script : "$config_directory/stop";
&proc::safe_process_exec_logged(
$stop_script, 0, 0, STDOUT, undef, 1,1);
$in{'root'} = '/';
$in{'adminfile'} = '$module_root_directory/adminupgrade';
@@ -339,6 +342,8 @@ elsif ($in{'mode'} eq 'solaris-pkg' || $in{'mode'} eq 'sun-pkg') {
$ENV{'config_dir'} = $config_directory;
$ENV{'webmin_upgrade'} = 1;
$ENV{'autothird'} = 1;
$ENV{'nostop'} = 1;
$ENV{'nostart'} = 1;
$ENV{'tempdir'} = $gconfig{'tempdir'};
print "<p>",$text{'upgrade_setup'},"<p>\n";
print "<pre>";
@@ -361,7 +366,7 @@ elsif ($in{'mode'} eq 'solaris-pkg' || $in{'mode'} eq 'sun-pkg') {
&proc::safe_process_exec(
"cd $dir && ./setup.sh", 0, 0, STDOUT, undef, 1, 1);
&proc::safe_process_exec_logged(
"$config_directory/start", 0, 0, STDOUT, undef, 1,1);
"$config_directory/.post-install", 0, 0, STDOUT, undef, 1,1);
print "</pre>\n";
}
elsif ($in{'mode'} eq 'gentoo') {