michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-06-20 19:30:30 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fixes to support newest Mandrake

Browse Source
This commit is contained in:
Jamie Cameron
2013-05-05 20:05:17 -07:00
parent 7449a1f13f
commit c6749fb112
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
software/urpmi-lib.pl
View File

@@ -12,7 +12,7 @@ sub update_system_install
{
local $update = $_[0] || $in{'update'};
local (@rv, @newpacks);
local $cmd = "urpmi --force --auto --media main";
local $cmd = "urpmi --force --auto";
print "<b>",&text('urpmi_install', "<tt>$cmd $update</tt>"),"</b><p>\n";
print "<pre>";
&additional_log('exec', undef, "$cmd $update");
@@ -57,11 +57,12 @@ print &ui_form_end();
sub update_system_resolve
{
local ($name) = @_;
return $name eq "apache" ? "apache2" :
$name eq "dhcpd" ? "dhcp-server" :
$name eq "mysql" ? "MySQL MySQL-client MySQL-common" :
return $name eq "dhcpd" ? "dhcp-server" :
$name eq "mysql" ? "mariadb" :
$name eq "openldap" ? "openldap openldap-servers" :
$name eq "postgresql" ? "postgresql postgresql-server" :
$name;
$name eq "samba" ? "samba-client samba-server" :
$name;
}
# update_system_available()

2
software/urpmi_upgrade.cgi
View File

@@ -10,7 +10,7 @@ if ($in{'upgrade'}) {
$mode = "upgrade";
}
else {
$cmd = "urpmi.update main updates contrib";
$cmd = "urpmi.update -a";
$mode = "update";
}