1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smeaddons/MirrorList mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smeaddons/MirrorList |
2 |
|
|
--- smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smeaddons/MirrorList 2006-11-30 12:42:36.238734870 +1100 |
3 |
|
|
+++ mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smeaddons/MirrorList 2006-11-30 12:39:30.770950534 +1100 |
4 |
|
|
@@ -1 +1 @@ |
5 |
|
|
-http://mirror.contribs.org/mirrorlists/smeaddons |
6 |
|
|
+file:///etc/yum.repos.d/mirrors-smeaddons |
7 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smedev/MirrorList mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smedev/MirrorList |
8 |
|
|
--- smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smedev/MirrorList 2006-11-30 12:42:36.238734870 +1100 |
9 |
|
|
+++ mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smedev/MirrorList 2006-11-30 12:39:30.770950534 +1100 |
10 |
|
|
@@ -1 +1 @@ |
11 |
|
|
-http://mirror.contribs.org/mirrorlists/smedev |
12 |
|
|
+file:///etc/yum.repos.d/mirrors-smedev |
13 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smeos/MirrorList mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smeos/MirrorList |
14 |
|
|
--- smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smeos/MirrorList 2006-11-30 12:42:36.239734696 +1100 |
15 |
|
|
+++ mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smeos/MirrorList 2006-11-30 12:39:30.770950534 +1100 |
16 |
|
|
@@ -1 +1 @@ |
17 |
|
|
-http://mirror.contribs.org/mirrorlists/smeos |
18 |
|
|
+file:///etc/yum.repos.d/mirrors-smeos |
19 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smetest/MirrorList mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smetest/MirrorList |
20 |
|
|
--- smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smetest/MirrorList 2006-11-30 12:42:36.239734696 +1100 |
21 |
|
|
+++ mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smetest/MirrorList 2006-11-30 12:39:30.770950534 +1100 |
22 |
|
|
@@ -1 +1 @@ |
23 |
|
|
-http://mirror.contribs.org/mirrorlists/smetest |
24 |
|
|
+file:///etc/yum.repos.d/mirrors-smetest |
25 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smeupdates/MirrorList mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smeupdates/MirrorList |
26 |
|
|
--- smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smeupdates/MirrorList 2006-11-30 12:42:36.239734696 +1100 |
27 |
|
|
+++ mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smeupdates/MirrorList 2006-11-30 12:39:30.770950534 +1100 |
28 |
|
|
@@ -1 +1 @@ |
29 |
|
|
-http://mirror.contribs.org/mirrorlists/smeupdates |
30 |
|
|
+file:///etc/yum.repos.d/mirrors-smeupdates |
31 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/MirrorList mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/MirrorList |
32 |
|
|
--- smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/MirrorList 2006-11-30 12:42:36.239734696 +1100 |
33 |
|
|
+++ mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/MirrorList 2006-11-30 12:39:30.770950534 +1100 |
34 |
|
|
@@ -1 +1 @@ |
35 |
|
|
-http://mirror.contribs.org/mirrorlists/smeupdates-testing |
36 |
|
|
+file:///etc/yum.repos.d/mirrors-smeupdates-testing |
37 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-yum-1.2.0/root/etc/e-smith/templates/etc/yum.conf/20repositories mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/templates/etc/yum.conf/20repositories |
38 |
|
|
--- smeserver-yum-1.2.0/root/etc/e-smith/templates/etc/yum.conf/20repositories 2006-11-30 12:42:36.230736258 +1100 |
39 |
|
|
+++ mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/templates/etc/yum.conf/20repositories 2006-11-30 12:42:14.065582969 +1100 |
40 |
|
|
@@ -13,7 +13,17 @@ |
41 |
|
|
$OUT .= "enabled=" . (($repos->prop('status') eq 'enabled') ? 1 : 0) |
42 |
|
|
. "\n"; |
43 |
|
|
|
44 |
|
|
- for my $prop (qw(Name BaseURL)) |
45 |
|
|
+ if ( exists $props{MirrorList} ) |
46 |
|
|
+ { |
47 |
|
|
+ $OUT .= lc($prop) . '=' . $props{$prop} . "\n"; |
48 |
|
|
+ $OUT .= '#baseurl=' . $props{BaseURL} . "\n"; |
49 |
|
|
+ } |
50 |
|
|
+ else |
51 |
|
|
+ { |
52 |
|
|
+ $OUT .= 'baseurl=' . $props{BaseURL} . "\n"; |
53 |
|
|
+ } |
54 |
|
|
+ |
55 |
|
|
+ for my $prop (qw(Name)) |
56 |
|
|
{ |
57 |
|
|
$OUT .= lc($prop) . '=' . $props{$prop} . "\n"; |
58 |
|
|
} |
59 |
|
|
@@ -23,12 +33,6 @@ |
60 |
|
|
$OUT .= lc($prop) . '=' . ($props{$prop} eq "yes" ? 1 : 0) . "\n"; |
61 |
|
|
} |
62 |
|
|
|
63 |
|
|
- for my $prop (qw(MirrorList)) |
64 |
|
|
- { |
65 |
|
|
- next unless exists $props{$prop}; |
66 |
|
|
- $OUT .= lc($prop) . '=' . $props{$prop} . "\n"; |
67 |
|
|
- } |
68 |
|
|
- |
69 |
|
|
if (exists $props{Exclude}) |
70 |
|
|
{ |
71 |
|
|
$OUT .= "exclude=" . join(' ', split(/,/, $props{Exclude})) . "\n"; |