1 |
slords |
1.1 |
diff -ruN e-smith-base-5.4.0.noapmd/createlinks e-smith-base-5.4.0/createlinks |
2 |
|
|
--- e-smith-base-5.4.0.noapmd/createlinks 2013-02-06 14:14:56.801937994 -0700 |
3 |
|
|
+++ e-smith-base-5.4.0/createlinks 2013-02-06 14:15:56.759936868 -0700 |
4 |
|
|
@@ -559,7 +559,6 @@ |
5 |
|
|
cpuspeed => "06", |
6 |
|
|
'bootstrap-console' => "10", |
7 |
|
|
raidmonitor => "15", |
8 |
|
|
- apmd => "26", |
9 |
|
|
network => "37", |
10 |
|
|
irqbalance => "39", |
11 |
|
|
crond => "40", |
12 |
|
|
diff -ruN e-smith-base-5.4.0.noapmd/root/etc/e-smith/db/configuration/defaults/apmd/status e-smith-base-5.4.0/root/etc/e-smith/db/configuration/defaults/apmd/status |
13 |
|
|
--- e-smith-base-5.4.0.noapmd/root/etc/e-smith/db/configuration/defaults/apmd/status 2013-01-31 08:53:10.000000000 -0700 |
14 |
|
|
+++ e-smith-base-5.4.0/root/etc/e-smith/db/configuration/defaults/apmd/status 1969-12-31 17:00:00.000000000 -0700 |
15 |
|
|
@@ -1 +0,0 @@ |
16 |
|
|
-disabled |
17 |
|
|
diff -ruN e-smith-base-5.4.0.noapmd/root/etc/e-smith/db/configuration/defaults/apmd/type e-smith-base-5.4.0/root/etc/e-smith/db/configuration/defaults/apmd/type |
18 |
|
|
--- e-smith-base-5.4.0.noapmd/root/etc/e-smith/db/configuration/defaults/apmd/type 2005-11-20 21:28:04.000000000 -0700 |
19 |
|
|
+++ e-smith-base-5.4.0/root/etc/e-smith/db/configuration/defaults/apmd/type 1969-12-31 17:00:00.000000000 -0700 |
20 |
|
|
@@ -1 +0,0 @@ |
21 |
|
|
-service |
22 |
|
|
diff -ruN e-smith-base-5.4.0.noapmd/root/etc/e-smith/db/configuration/migrate/10apmdStatus e-smith-base-5.4.0/root/etc/e-smith/db/configuration/migrate/10apmdStatus |
23 |
|
|
--- e-smith-base-5.4.0.noapmd/root/etc/e-smith/db/configuration/migrate/10apmdStatus 2013-01-31 08:52:03.000000000 -0700 |
24 |
|
|
+++ e-smith-base-5.4.0/root/etc/e-smith/db/configuration/migrate/10apmdStatus 1969-12-31 17:00:00.000000000 -0700 |
25 |
|
|
@@ -1,8 +0,0 @@ |
26 |
|
|
-{ |
27 |
|
|
- my $apmd = $DB->get('apmd') || $DB->new_record('apmd', { type => 'service'}); |
28 |
|
|
- |
29 |
|
|
- my $arch = `/bin/uname -i`; |
30 |
|
|
- chomp($arch); |
31 |
|
|
- |
32 |
|
|
- $apmd->set_prop("status", "disabled") unless $arch eq 'i386'; |
33 |
|
|
-} |
34 |
|
|
diff -ruN e-smith-base-5.4.0.noapmd/root/etc/e-smith/templates/home/e-smith/ssl.key e-smith-base-5.4.0/root/etc/e-smith/templates/home/e-smith/ssl.key |
35 |
|
|
--- e-smith-base-5.4.0.noapmd/root/etc/e-smith/templates/home/e-smith/ssl.key 2013-01-31 08:52:03.000000000 -0700 |
36 |
|
|
+++ e-smith-base-5.4.0/root/etc/e-smith/templates/home/e-smith/ssl.key 2013-02-06 14:16:07.808937111 -0700 |
37 |
|
|
@@ -33,7 +33,6 @@ |
38 |
|
|
qw(genrsa -rand), |
39 |
|
|
join(':', |
40 |
|
|
qw( |
41 |
|
|
- /proc/apm |
42 |
|
|
/proc/cpuinfo |
43 |
|
|
/proc/dma |
44 |
|
|
/proc/filesystems |
45 |
|
|
Binary files e-smith-base-5.4.0.noapmd/root/etc/e-smith/web/common/stop.jpg and e-smith-base-5.4.0/root/etc/e-smith/web/common/stop.jpg differ |