mirror of
https://github.com/webmin/webmin.git
synced 2026-08-14 19:40:36 +01:00
Ignore exit status when checking for CSW install failure
This commit is contained in:
@@ -9,7 +9,7 @@ $pkg_get = -x "/opt/csw/bin/pkg-get" ? "/opt/csw/bin/pkg-get"
|
||||
sub update_system_install
|
||||
{
|
||||
local $update = $_[0] || $in{'update'};
|
||||
local (@rv, @newpacks);
|
||||
local (@rv, @newpacks, %seen, $failed);
|
||||
print "<b>",&text('csw_install', "<tt>$pkg_get -i $update</tt>"),"</b><p>\n";
|
||||
$| = 1;
|
||||
print "<pre>";
|
||||
@@ -54,7 +54,7 @@ while(1) {
|
||||
}
|
||||
print "</pre>";
|
||||
close($ph);
|
||||
if ($? || $failed) {
|
||||
if ($failed) {
|
||||
print "<b>$text{'csw_failed'}</b><p>\n";
|
||||
return ( );
|
||||
}
|
||||
|
||||
@@ -90,6 +90,7 @@ local ($name) = @_;
|
||||
return $name eq "apache" ? "httpd" :
|
||||
$name eq "dhcpd" ? "dhcp" :
|
||||
$name eq "mysql" ? "mysql mysql-server mysql-devel" :
|
||||
$name eq "openssh" ? "openssh openssh-server" :
|
||||
$name eq "postgresql" ? "postgresql postgresql-libs postgresql-server" :
|
||||
$name;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user