1 |
diff -Nur smeserver-yum-2.4.0.old/root/etc/e-smith/templates/etc/crontab/check4contribsupdates smeserver-yum-2.4.0/root/etc/e-smith/templates/etc/crontab/check4contribsupdates |
diff -Nur smeserver-yum-2.4.0/root/etc/e-smith/db/configuration/defaults/yum/CheckContribs smeserver-yum-2.4.0.bz8855/root/etc/e-smith/db/configuration/defaults/yum/CheckContribs |
2 |
--- smeserver-yum-2.4.0.old/root/etc/e-smith/templates/etc/crontab/check4contribsupdates 1970-01-01 01:00:00.000000000 +0100 |
--- smeserver-yum-2.4.0/root/etc/e-smith/db/configuration/defaults/yum/CheckContribs 1970-01-01 01:00:00.000000000 +0100 |
3 |
+++ smeserver-yum-2.4.0/root/etc/e-smith/templates/etc/crontab/check4contribsupdates 2014-11-19 17:59:47.540381038 +0100 |
+++ smeserver-yum-2.4.0.bz8855/root/etc/e-smith/db/configuration/defaults/yum/CheckContribs 2015-02-21 15:20:54.982110115 +0100 |
4 |
@@ -0,0 +1,25 @@ |
@@ -0,0 +1 @@ |
5 |
|
+enabled |
6 |
|
diff -Nur smeserver-yum-2.4.0/root/etc/e-smith/db/configuration/migrate/Yum-remove-check4contribsupdates smeserver-yum-2.4.0.bz8855/root/etc/e-smith/db/configuration/migrate/Yum-remove-check4contribsupdates |
7 |
|
--- smeserver-yum-2.4.0/root/etc/e-smith/db/configuration/migrate/Yum-remove-check4contribsupdates 1970-01-01 01:00:00.000000000 +0100 |
8 |
|
+++ smeserver-yum-2.4.0.bz8855/root/etc/e-smith/db/configuration/migrate/Yum-remove-check4contribsupdates 2015-02-21 16:28:14.387219668 +0100 |
9 |
|
@@ -0,0 +1,11 @@ |
10 |
+{ |
+{ |
11 |
+ return "\n# yum check for updates is disabled\n" unless $yum{status} eq 'enabled'; |
+#Added for bug 8855 and bug 8858 |
12 |
|
+#we want to remove the property check4contribsupdates |
13 |
|
+ |
14 |
+ |
+ |
15 |
+ my $freq = $yum{check4contribsupdates} || 'daily'; |
+my $check4contribsupdates = $DB->get_prop('yum','check4contribsupdates'); |
16 |
|
+ |
17 |
|
+if ($check4contribsupdates) { |
18 |
|
+ $DB->get('yum')->delete_prop('check4contribsupdates'); |
19 |
|
+ } |
20 |
|
+} |
21 |
|
diff -Nur smeserver-yum-2.4.0/root/etc/e-smith/templates/etc/crontab/check4contribsupdates smeserver-yum-2.4.0.bz8855/root/etc/e-smith/templates/etc/crontab/check4contribsupdates |
22 |
|
--- smeserver-yum-2.4.0/root/etc/e-smith/templates/etc/crontab/check4contribsupdates 1970-01-01 01:00:00.000000000 +0100 |
23 |
|
+++ smeserver-yum-2.4.0.bz8855/root/etc/e-smith/templates/etc/crontab/check4contribsupdates 2015-02-21 15:29:17.585570439 +0100 |
24 |
|
@@ -0,0 +1,25 @@ |
25 |
|
+{ |
26 |
|
+ return "\n# yum check for smecontribs updates is disabled\n" unless (($yum{status} eq 'enabled') && ($yum{CheckContribs} eq 'enabled')); |
27 |
|
+ |
28 |
|
+ my $freq = $yum{check4updates} || 'daily'; |
29 |
+ |
+ |
30 |
+ my $min; |
+ my $min; |
31 |
+ my $dom; |
+ my $dom; |
47 |
+ return "$min 4 $dom * $dow root " |
+ return "$min 4 $dom * $dow root " |
48 |
+ . q{sleep $[ $RANDOM \\% 3600 ]; /sbin/e-smith/check4contribsupdates -m }; |
+ . q{sleep $[ $RANDOM \\% 3600 ]; /sbin/e-smith/check4contribsupdates -m }; |
49 |
+} |
+} |
50 |
diff -Nur smeserver-yum-2.4.0.old/root/sbin/e-smith/check4contribsupdates smeserver-yum-2.4.0/root/sbin/e-smith/check4contribsupdates |
diff -Nur smeserver-yum-2.4.0/root/sbin/e-smith/check4contribsupdates smeserver-yum-2.4.0.bz8855/root/sbin/e-smith/check4contribsupdates |
51 |
--- smeserver-yum-2.4.0.old/root/sbin/e-smith/check4contribsupdates 1970-01-01 01:00:00.000000000 +0100 |
--- smeserver-yum-2.4.0/root/sbin/e-smith/check4contribsupdates 1970-01-01 01:00:00.000000000 +0100 |
52 |
+++ smeserver-yum-2.4.0/root/sbin/e-smith/check4contribsupdates 2014-11-19 17:58:02.709057486 +0100 |
+++ smeserver-yum-2.4.0.bz8855/root/sbin/e-smith/check4contribsupdates 2015-02-21 15:18:57.521125460 +0100 |
53 |
@@ -0,0 +1,27 @@ |
@@ -0,0 +1,27 @@ |
54 |
+#! /bin/bash |
+#! /bin/bash |
55 |
+ |
+ |