1 |
--- software/urpmi-lib.pl~ 2012-11-14 20:27:38.000000000 -0500 |
2 |
+++ software/urpmi-lib.pl 2012-12-13 13:51:13.115131392 -0500 |
3 |
@@ -12,7 +12,7 @@ |
4 |
{ |
5 |
local $update = $_[0] || $in{'update'}; |
6 |
local (@rv, @newpacks); |
7 |
-local $cmd = "urpmi --force --auto --media main"; |
8 |
+local $cmd = "urpmi --force --auto"; |
9 |
print "<b>",&text('urpmi_install', "<tt>$cmd $update</tt>"),"</b><p>\n"; |
10 |
print "<pre>"; |
11 |
&additional_log('exec', undef, "$cmd $update"); |
12 |
@@ -57,10 +57,10 @@ |
13 |
sub update_system_resolve |
14 |
{ |
15 |
local ($name) = @_; |
16 |
-return $name eq "apache" ? "apache2" : |
17 |
- $name eq "dhcpd" ? "dhcp-server" : |
18 |
- $name eq "mysql" ? "MySQL MySQL-client MySQL-common" : |
19 |
+return $name eq "dhcpd" ? "dhcp-server" : |
20 |
+ $name eq "openldap" ? "openldap openldap-servers" : |
21 |
$name eq "postgresql" ? "postgresql postgresql-server" : |
22 |
+ $name eq "samba" ? "samba-client samba-server" : |
23 |
$name; |
24 |
} |
25 |
|
26 |
--- software/urpmi_upgrade.cgi 2012-11-15 01:27:39.000000000 +0000 |
27 |
+++ software/urpmi_upgrade.cgi 2012-12-13 10:25:36.000000000 +0000 |
28 |
@@ -1,4 +1,4 @@ |
29 |
-#!/usr/local/bin/perl |
30 |
+#!/usr/bin/perl |
31 |
# Upgrade all packages, or update the database of URPMI packages |
32 |
|
33 |
require './software-lib.pl'; |
34 |
@@ -10,7 +10,7 @@ |
35 |
$mode = "upgrade"; |
36 |
} |
37 |
else { |
38 |
- $cmd = "urpmi.update main updates contrib"; |
39 |
+ $cmd = "urpmi.update -a"; |
40 |
$mode = "update"; |
41 |
} |
42 |
|