Improve init script and enhance default.conf

4 files changed, 391 insertions, 47 deletions

diff --git a/www-apps/rpi-monitor/Manifest b/www-apps/rpi-monitor/Manifest
index 4cdf1515..ca94bfc4 100644
--- a/www-apps/rpi-monitor/Manifest
+++ b/www-apps/rpi-monitor/Manifest
@@ -1,6 +1,6 @@
-AUX default.conf.patch 9161 SHA256 ea929ee56b97627c8eb09dfbae50c59b6332ca0f855614fd72ff90bc1ddf7412 SHA512 531c2d6e0c97e622d30b42eddc844d87b2755740b7ead90a9b641fdccaf4762eb974a5338b1ea7abc8bc0193b5e4fe059e433c0aa8978a7d31f8ab27e13687e8 WHIRLPOOL edce7f466a40239e7189e290753e6bd1d9261c5456bf6dd15a4c289ff37f0974d0bb23eb9b6c50aefd3541bf8f6d4107b46577559326f885be59bae42bad7352
+AUX default.conf.patch 24353 SHA256 d1c071ccd76eee2150ff979db974773da9f82c574dd2df6a76aa09ed1eb7534a SHA512 404abbc90c14bf88ea93ff057785a4bfbd163f1a86bb74916d9d32b42ea8b2a37214d96df3b8da23b6a366aa8744bf55816009f3f191f5c49d9139effd886211 WHIRLPOOL 04e4a7fa4150084139bbcb75aa6cc870821cd4b762b78bd2ef0cbe925db86eb05343e63ea7de9ef9f8a435fbabaa28a4828a9017b0e8675a50fcf1a12d3ba4c3
 AUX rpimonitor.confd 112 SHA256 b683366153e78b3f2e3040036315ed4bb6e97f6963dde609b3099551dc84795a SHA512 46c2f4340023f8b7957f604f1baa661eb4a97f54a2f6a03abf25525d9c7db78135dc556866cea416080398e6af84c7ac6c935e4230154f5164cb1535607e3395 WHIRLPOOL 869fc2d100e725d3f171d509b6bd997b9f9ada00600c237b30f8e6951cd7dc4fe4be2d72e343dba9caaab1b61c741cd3422cf137dd94bd7571be0c837d447ece
-AUX rpimonitor.initd 589 SHA256 4e722b442d49de1309797d015217984634368185e08e4805f35788ce1060c076 SHA512 59fea3c84080c0d6bf4354618e2156ea1d422f08a5e3cf329cb1187fa4105ed9929ddb2c6e05e12439217dc85bae520416e9e66938555f09033392126d66f1b1 WHIRLPOOL f229c339f194f535923063509a035147b29b3c457ebd8fb0570a4f21afe639e3df00d84ff27c361b584c47d4a7974b5a90d633b9c28bbe9d5ad16e38c3be60dc
+AUX rpimonitor.initd 973 SHA256 d9ae46e6fa0eaef295736fc9bfc9b4c8af000d67bf4b102375c3ba21610e8653 SHA512 e9bab0b0f1fe8cb6425fa3ddef157df28ef3be344927dbff9d216cb57e31c57a7b79181999fa067e69c62364f5eb1a665d21efdbfd82fdf7dc8b1d54c9efbd1d WHIRLPOOL 3714306bc6b33150dd0ecb3128d044099ecaa92ac4c77b33f1289060bd6112671c8ea764715e3aabfbfd9ee962d6beecc20b180bc2b2583856467e75d0f86a2b
 DIST rpi-monitor-2.2.zip 292550 SHA256 e37f4be434c47a48c22e4db649e7960c9ab2e6c8851187a2628b71225121f25e SHA512 731a229097e7472e357af2b52ebebfeae65f73f91a44b3bb7c09c7ce72ddb55e2cdb1b03a9147094c359330a0e12e1b5ad9c754f2a3ce70e5a7287980643f4cc WHIRLPOOL 153e6e9a33c71255a787fceeb74d6f0c1ca15079682296f4971882781c62bc241a323ce9f1d91fa49cc5d2b4f541ae94b2da844bdc27ba2809cba1ffa02c1e5d
 DIST rpi-monitor-deb-2.2.zip 2127268 SHA256 04bd659402cda83df2d34fb38efce4db710f1c63ec41e1905cca9d4d3b41f516 SHA512 ed51fec16b0c23fe73c9b733d4cf8f655089d13c408803970a834d1f5c3a71df026814dd2b6d2ea0759e533e154185beca70eb7048468566cef55fb4ac7b6c2f WHIRLPOOL 006bb1f20f1d6e54e73e1f7f8b6eeb85e75219190450dcd16d2104f555f75dc5751034b1f62af7923137da260f730390c2d668860825cd61d4d6548a23f0e1b3
-EBUILD rpi-monitor-2.2.ebuild 3069 SHA256 b5dea21a768e9fcf94a33a853ed36db6b5dad58af631fe3da547621dbfc101ee SHA512 247d132bcd7af9e0fd1b9e6e995a001103aba44b4ef4ccdf165614f06447c6a929ef4f0016a251cc2f2448dce62802dd6c13962829e18684c812ba5e6491eee0 WHIRLPOOL 34d4a75693b93d0d8f121fc0575494a770dc45c250f16e4cfcd1e330682704dbfc4603e2445ea3f0b6a8a71150ea6117b53e51703ddc6807f6abcd82353e6b69
+EBUILD rpi-monitor-2.2.ebuild 3087 SHA256 fa314d8c7132d3f5def4e1de9edc51ee33c3a44addc0b962530ca92a29ae508d SHA512 b310ade8af35780d5dd6f5b7e92dfa4d4730268e0297117826562d3d6157377566632f1caf1a120d3e0cb5f1beeeaac455e3b98f1991cdbd6fa3651d13c92366 WHIRLPOOL e8467989a31967da50c8e00800bc72155670dc511e389430e10b9d046695b90d5aafddbfeba92c92ba54f38ea827a7212a915a880a69483db3a9e71b6d4685c8
diff --git a/www-apps/rpi-monitor/files/default.conf.patch b/www-apps/rpi-monitor/files/default.conf.patch
index f9bef279..2fc11cbc 100644
--- a/www-apps/rpi-monitor/files/default.conf.patch
+++ b/www-apps/rpi-monitor/files/default.conf.patch
@@ -1,5 +1,5 @@
---- rpimonitor/default.conf.dist	2013-07-19 11:51:54.000000000 +0100
-+++ rpimonitor/default.conf	2013-07-31 23:30:31.475030708 +0100
+--- rpimonitor/default.conf.dist	2013-08-17 14:54:04.390056536 +0100
++++ rpimonitor/default.conf	2013-08-17 15:09:06.206429700 +0100
 @@ -1,64 +1,73 @@
  ########################################################################
  # KPI extraction configuration 
@@ -120,7 +120,7 @@
  # 
  ########################################################################
  static.1.name=distribution
-@@ -78,7 +87,7 @@
+@@ -78,113 +87,156 @@
  
  static.4.name=processor
  static.4.source=/proc/cpuinfo
@@ -128,9 +128,32 @@
 +static.4.regexp=model name\s+: (.*)
  static.4.postprocess=
  
- static.5.name=scaling_governor
-@@ -97,27 +106,27 @@
- static.7.postprocess=$1/1024
+-static.5.name=scaling_governor
+-static.5.source=/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+-static.5.regexp=(.*)
++static.5.name=hardware
++static.5.source=/proc/cpuinfo
++static.5.regexp=Hardware\s+: (.*)
+ static.5.postprocess=
+ 
+-static.6.name=memory_total
+-static.6.source=/proc/meminfo
+-static.6.regexp=MemTotal:\s+(\d+)
+-static.6.postprocess=$1/1024
+-
+-static.7.name=swap_total
+-static.7.source=/proc/meminfo
+-static.7.regexp=SwapTotal:\s+(\d+)
+-static.7.postprocess=$1/1024
++static.6.name=revision
++static.6.source=/proc/cpuinfo
++static.6.regexp=Revision\s+: 0*(\d+)
++static.6.postprocess=
++
++static.7.name=serial
++static.7.source=/proc/cpuinfo
++static.7.regexp=Serial\s+: (.*)
++static.7.postprocess=
  
  static.8.name=sdcard_root_total
 -static.8.source=df -t ext4
@@ -146,18 +169,17 @@
 +static.9.regexp=^[^\s]+\s+(\d+)
  static.9.postprocess=$1/1024
  
++# Also monitor the default mount from sys-apps/tmpfs - which should be used
++# with RPi-Monitor in order to reduce writes to SD!
++#static.11.name=tmpfs_ram_total
++#static.11.source=df /mnt/ram
++#static.11.regexp=^[^\s]+\s+(\d+)
++#static.11.postprocess=$1/1024
++
  ##############################################################################
 -dynamic.1.name=upgrade
 -dynamic.1.source=/usr/share/rpimonitor/updatestatus.txt
 -dynamic.1.regexp=(\d+ upgraded, \d+ .*|.* .*)
--dynamic.1.postprocess=
--dynamic.1.rrd=
--
--dynamic.2.name=packages
--dynamic.2.source=/usr/share/rpimonitor/updatestatus.txt
--dynamic.2.regexp=^  (.*)\d+ upgraded,
--dynamic.2.postprocess=
--dynamic.2.rrd=
 +#dynamic.1.name=upgrade
 +#dynamic.1.source=/usr/share/rpimonitor/updatestatus.txt
 +#dynamic.1.regexp=(\d+ upgraded, \d+ .*|.* .*)
@@ -169,43 +191,350 @@
 +#dynamic.2.regexp=^  (.*)\d+ upgraded,
 +#dynamic.2.postprocess=
 +#dynamic.2.rrd=
++
++dynamic.1.name=scaling_governor
++dynamic.1.source=/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
++dynamic.1.regexp=(.*)
+ dynamic.1.postprocess=
+ dynamic.1.rrd=
  
- dynamic.3.name=cpu_frequency
- dynamic.3.source=/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_cur_freq
-@@ -126,7 +135,7 @@
- dynamic.3.rrd=
- 
- dynamic.4.name=cpu_voltage
+-dynamic.2.name=packages
+-dynamic.2.source=/usr/share/rpimonitor/updatestatus.txt
+-dynamic.2.regexp=^  (.*)\d+ upgraded,
+-dynamic.2.postprocess=
+-dynamic.2.rrd=
+-
+-dynamic.3.name=cpu_frequency
+-dynamic.3.source=/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_cur_freq
+-dynamic.3.regexp=(.*)
+-dynamic.3.postprocess=$1/1000
+-dynamic.3.rrd=
+-
+-dynamic.4.name=cpu_voltage
 -dynamic.4.source=vcgencmd measure_volts core
-+dynamic.4.source=/opt/vc/bin/vcgencmd measure_volts core
- dynamic.4.regexp=(\d+.\d+)V
+-dynamic.4.regexp=(\d+.\d+)V
++dynamic.2.name=cpu_frequency
++dynamic.2.source=/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_cur_freq
++dynamic.2.regexp=(.*)
++dynamic.2.postprocess=$1/1000
++dynamic.2.rrd=GAUGE
++
++dynamic.3.name=cpu_voltage
++dynamic.3.source=/opt/vc/bin/vcgencmd measure_volts core
++dynamic.3.regexp=(\d+.\d+)V
++dynamic.3.postprocess=
++dynamic.3.rrd=GAUGE
++
++dynamic.4.name=load1,load5,load15
++dynamic.4.source=/proc/loadavg
++dynamic.4.regexp=^(\S+)\s(\S+)\s(\S+)
  dynamic.4.postprocess=
- dynamic.4.rrd=
-@@ -138,14 +147,14 @@
+-dynamic.4.rrd=
++dynamic.4.rrd=GAUGE
+ 
+-dynamic.5.name=load1,load5,load15
+-dynamic.5.source=/proc/loadavg
+-dynamic.5.regexp=^(\S+)\s(\S+)\s(\S+)
+-dynamic.5.postprocess=
++dynamic.5.name=sdcard_root_used
++dynamic.5.source=df /
++dynamic.5.regexp=^[^\s]+\s+\d+\s+(\d+)
++dynamic.5.postprocess=$1/1024
  dynamic.5.rrd=GAUGE
  
- dynamic.6.name=sdcard_root_used
+-dynamic.6.name=sdcard_root_used
 -dynamic.6.source=df -t ext4
 -dynamic.6.regexp=root\s+\d+\s+(\d+)
-+dynamic.6.source=df /
++dynamic.6.name=sdcard_boot_used
++dynamic.6.source=df /boot
 +dynamic.6.regexp=^[^\s]+\s+\d+\s+(\d+)
  dynamic.6.postprocess=$1/1024
  dynamic.6.rrd=GAUGE
  
- dynamic.7.name=sdcard_boot_used
+-dynamic.7.name=sdcard_boot_used
 -dynamic.7.source=df -t vfat
 -dynamic.7.regexp=mmcblk0p1\s+\d+\s+(\d+)
-+dynamic.7.source=df /boot
-+dynamic.7.regexp=^[^\s]+\s+\d+\s+(\d+)
- dynamic.7.postprocess=$1/1024
- dynamic.7.rrd=GAUGE
- 
-@@ -314,7 +323,7 @@
- web.status.1.content.1.line.2='Distribution: <b>'+ data.distribution + '</b>'
- web.status.1.content.1.line.3='Kernel version: <b>' + data.kernel_version + '</b>'
- web.status.1.content.1.line.4='Firmware: <b>' + data.firmware + '</b>'
+-dynamic.7.postprocess=$1/1024
+-dynamic.7.rrd=GAUGE
+-
+-dynamic.8.name=swap_used
+-dynamic.8.source=/proc/meminfo
+-dynamic.8.regexp=SwapFree:\s+(\d+)
+-dynamic.8.postprocess=$this->{'static'}->{'swap_total'} - ($1/1024)
+-dynamic.8.rrd=GAUGE
++#dynamic.8.name=tmpfs_ram_used
++#dynamic.8.source=df /mnt/ram
++#dynamic.8.regexp=^[^\s]+\s+\d+\s+(\d+)
++#dynamic.8.postprocess=$1/1024
++#dynamic.8.rrd=GAUGE
+ 
+-dynamic.9.name=memory_free
++dynamic.9.name=swap_total
+ dynamic.9.source=/proc/meminfo
+-dynamic.9.regexp=MemFree:\s+(\d+)
++dynamic.9.regexp=SwapTotal:\s+(\d+)
+ dynamic.9.postprocess=$1/1024
+ dynamic.9.rrd=GAUGE
+ 
+-dynamic.10.name=net_received
+-dynamic.10.source=/sys/class/net/eth0/statistics/rx_bytes
+-dynamic.10.regexp=(.*)
+-dynamic.10.postprocess=$1*-1
+-dynamic.10.rrd=DERIVE
+-
+-dynamic.11.name=net_send
+-dynamic.11.source=/sys/class/net/eth0/statistics/tx_bytes
+-dynamic.11.regexp=(.*)
++dynamic.10.name=swap_used
++dynamic.10.source=/proc/meminfo
++dynamic.10.regexp=SwapFree:\s+(\d+)
++dynamic.10.postprocess=$this->{'dynamic'}->{'swap_total'} - ($1/1024)
++dynamic.10.rrd=GAUGE
++
++dynamic.11.name=memory_total
++dynamic.11.source=/opt/vc/bin/vcgencmd get_mem arm
++dynamic.11.regexp=^.*=(\d+)M$
+ dynamic.11.postprocess=
+-dynamic.11.rrd=DERIVE
++dynamic.11.rrd=GAUGE
+ 
+-dynamic.12.name=soc_temp
+-dynamic.12.source=/sys/devices/virtual/thermal/thermal_zone0/temp
+-dynamic.12.regexp=(.*)
+-dynamic.12.postprocess=$1/1000
++dynamic.12.name=memory_gpu
++dynamic.12.source=/opt/vc/bin/vcgencmd get_mem gpu
++dynamic.12.regexp=^.*=(\d+)M$
++dynamic.12.postprocess=
+ dynamic.12.rrd=GAUGE
+ 
+-dynamic.13.name=uptime
+-dynamic.13.source=/proc/uptime
+-dynamic.13.regexp=(^\S+)
+-dynamic.13.postprocess=
++dynamic.13.name=memory_free
++dynamic.13.source=/proc/meminfo
++dynamic.13.regexp=MemFree:\s+(\d+)
++dynamic.13.postprocess=$1/1024
+ dynamic.13.rrd=GAUGE
+ 
++dynamic.14.name=memory_used
++dynamic.14.source=/proc/meminfo
++dynamic.14.regexp=MemFree:\s+(\d+)
++dynamic.14.postprocess=$this->{'dynamic'}->{'memory_total'} - ($1/1024)
++dynamic.14.rrd=GAUGE
++
++dynamic.15.name=net_received
++dynamic.15.source=/sys/class/net/eth0/statistics/rx_bytes
++dynamic.15.regexp=(.*)
++dynamic.15.postprocess=$1*-1
++dynamic.15.rrd=DERIVE
++
++dynamic.16.name=net_send
++dynamic.16.source=/sys/class/net/eth0/statistics/tx_bytes
++dynamic.16.regexp=(.*)
++dynamic.16.postprocess=
++dynamic.16.rrd=DERIVE
++
++dynamic.17.name=soc_temp
++dynamic.17.source=/sys/devices/virtual/thermal/thermal_zone0/temp
++dynamic.17.regexp=(.*)
++dynamic.17.postprocess=$1/1000
++dynamic.17.rrd=GAUGE
++
++dynamic.18.name=uptime
++dynamic.18.source=/proc/uptime
++dynamic.18.regexp=(^\S+)
++dynamic.18.postprocess=
++dynamic.18.rrd=GAUGE
++
+ ########################################################################
+ # Web interface configuration
+ # 
+@@ -308,13 +360,16 @@
+ 
+ #######################################################################
+ web.status.1.name=Raspberry Pi
++
+ web.status.1.content.1.name=Version
+ web.status.1.content.1.icon=version.png
+ web.status.1.content.1.line.1='Processor: <b>' + data.processor + '</b>'
+-web.status.1.content.1.line.2='Distribution: <b>'+ data.distribution + '</b>'
+-web.status.1.content.1.line.3='Kernel version: <b>' + data.kernel_version + '</b>'
+-web.status.1.content.1.line.4='Firmware: <b>' + data.firmware + '</b>'
 -web.status.1.content.1.line.5='Package(s) to be: <b>' + data.upgrade + '</b>' + ShowInfo('packages','Package update',data.packages)
-+#web.status.1.content.1.line.5='Package(s) to be: <b>' + data.upgrade + '</b>' + ShowInfo('packages','Package update',data.packages)
++web.status.1.content.1.line.2='Hardware: <b>' + data.hardware + '</b> revision <b>' + data.revision + '</b>'
++web.status.1.content.1.line.3='Serial number: <b>' + data.serial + '</b>'
++web.status.1.content.1.line.4='Distribution: <b>'+ data.distribution + '</b>'
++web.status.1.content.1.line.5='Kernel version: <b>' + data.kernel_version + '</b>'
++web.status.1.content.1.line.6='Firmware: <b>' + data.firmware + '</b>'
++#web.status.1.content.1.line.7='Package(s) to be: <b>' + data.upgrade + '</b>' + ShowInfo('packages','Package update',data.packages)
  
  web.status.1.content.2.name=Uptime
  web.status.1.content.2.icon=uptime.png
+@@ -333,8 +388,9 @@
+ 
+ web.status.1.content.5.name=Memory
+ web.status.1.content.5.icon=memory.png
+-web.status.1.content.5.line.1="Used: <b>" + KMG(data.memory_total-data.memory_free,'M') + "</b> (<b>" + Percent(data.memory_free,data.memory_total,'M') + "</b>) Free: <b>" + KMG(data.memory_free,'M') + "</b> Total: <b>" + KMG(data.memory_total,'M') + "</b>"
+-web.status.1.content.5.line.2=ProgressBar(data.memory_total-data.memory_free,data.memory_total)
++web.status.1.content.5.line.1="Used: <b>" + KMG(data.memory_used,'M') + "</b> (<b>" + Percent(data.memory_used,data.memory_total,'M') + "</b>) Free: <b>" + KMG(data.memory_free,'M') + "</b> Total: <b>" + KMG(data.memory_total,'M') + "</b>"
++web.status.1.content.5.line.2="GPU: <b>" + KMG(data.memory_gpu,'M') + "</b>"
++web.status.1.content.5.line.3=ProgressBar(data.memory_used,data.memory_total)
+ 
+ web.status.1.content.6.name=Swap
+ web.status.1.content.6.icon=swap.png
+@@ -348,66 +404,94 @@
+ web.status.1.content.7.line.3="<b>/</b> Used: <b>"+KMG(data.sdcard_root_used,'M') + "</b> (<b>" + Percent(data.sdcard_root_used,data.sdcard_root_total,'M')+"</b>) Free: <b>"+KMG(data.sdcard_root_total-data.sdcard_root_used,'M')+ "</b> Total: <b>"+ KMG(data.sdcard_root_total,'M') + "</b>"
+ web.status.1.content.7.line.4=ProgressBar(data.sdcard_root_used,data.sdcard_root_total)
+ 
+-web.status.1.content.8.name=Network
+-web.status.1.content.8.icon=network.png
+-web.status.1.content.8.line.1="Ethernet Sent: <b>"+KMG(data.net_send)+"<i class='icon-arrow-up'></i></b> Received: <b>"+KMG(Math.abs(data.net_received)) + "<i class='icon-arrow-down'></i></b>"
++#web.status.1.content.8.name=RAM fs
++#web.status.1.content.8.icon=memory.png
++#web.status.1.content.8.line.1="Used: <b>"+KMG(data.tmpfs_ram_used,'M')+"</b> (<b>"+Percent(data.tmpfs_ram_used,data.tmpfs_ram_total,'M')+"</b>) Free: <b>"+KMG(data.tmpfs_ram_total-data.tmpfs_ram_used,'M')+ "</b> Total: <b>"+ KMG(data.tmpfs_ram_total,'M') + "</b>"
++#web.status.1.content.8.line.2=ProgressBar(data.tmpfs_ram_used,data.tmpfs_ram_total)
++
++web.status.1.content.9.name=Network
++web.status.1.content.9.icon=network.png
++web.status.1.content.9.line.1="Ethernet Sent: <b>"+KMG(data.net_send)+"<i class='icon-arrow-up'></i></b> Received: <b>"+KMG(Math.abs(data.net_received)) + "<i class='icon-arrow-down'></i></b>"
+ 
+ #######################################################################
+ web.statistics.1.name=Raspberry Pi
+-web.statistics.1.content.1.name=CPU Loads
+-web.statistics.1.content.1.graph.1=load1
+-web.statistics.1.content.1.graph.2=load5
+-web.statistics.1.content.1.graph.3=load15
+-web.statistics.1.content.1.ds_graph_options.load1.label=Load 1min 
+-web.statistics.1.content.1.ds_graph_options.load5.label=Load 5min 
+-web.statistics.1.content.1.ds_graph_options.load15.label=Load 15min 
+-
+-web.statistics.1.content.2.name=Network
+-web.statistics.1.content.2.graph.1=net_send
+-web.statistics.1.content.2.graph.2=net_received
+-web.statistics.1.content.2.ds_graph_options.net_send.label=Upload bandwidth (bits)
+-web.statistics.1.content.2.ds_graph_options.net_send.lines={ fill: true }
+-web.statistics.1.content.2.ds_graph_options.net_send.color="#FF7777"
+-web.statistics.1.content.2.ds_graph_options.net_received.label=Download bandwidth (bits)
+-web.statistics.1.content.2.ds_graph_options.net_received.lines={ fill: true }
+-web.statistics.1.content.2.ds_graph_options.net_received.color="#77FF77"
+-
+-web.statistics.1.content.3.name=Disks - boot
+-web.statistics.1.content.3.graph.1=sdcard_boot_total
+-web.statistics.1.content.3.graph.2=sdcard_boot_used
+-web.statistics.1.content.3.ds_graph_options.sdcard_boot_total.label=Size of /boot (MB)
+-web.statistics.1.content.3.ds_graph_options.sdcard_boot_total.color="#FF7777"
+-web.statistics.1.content.3.ds_graph_options.sdcard_boot_used.label=Used on /boot (MB)
+-web.statistics.1.content.3.ds_graph_options.sdcard_boot_used.lines={ fill: true }
+-web.statistics.1.content.3.ds_graph_options.sdcard_boot_used.color="#7777FF"
+-
+-web.statistics.1.content.4.name=Disks - root
+-web.statistics.1.content.4.graph.1=sdcard_root_total
+-web.statistics.1.content.4.graph.2=sdcard_root_used
+-web.statistics.1.content.4.ds_graph_options.sdcard_root_total.label=Size of / (MB)
+-web.statistics.1.content.4.ds_graph_options.sdcard_root_total.color="#FF7777"
+-web.statistics.1.content.4.ds_graph_options.sdcard_root_used.label=Used on / (MB)
+-web.statistics.1.content.4.ds_graph_options.sdcard_root_used.lines={ fill: true }
+-web.statistics.1.content.4.ds_graph_options.sdcard_root_used.color="#7777FF"
+-
+-web.statistics.1.content.5.name=Swap
+-web.statistics.1.content.5.graph.1=swap_total
+-web.statistics.1.content.5.graph.2=swap_used
+-web.statistics.1.content.5.ds_graph_options.swap_total.label=Swap size (MB)
+-web.statistics.1.content.5.ds_graph_options.swap_total.color="#FF7777"
+-web.statistics.1.content.5.ds_graph_options.swap_used.label=Swap used (MB)
+-web.statistics.1.content.5.ds_graph_options.swap_used.lines={ fill: true }
+-web.statistics.1.content.5.ds_graph_options.swap_used.color="#7777FF"
+-
+-web.statistics.1.content.6.name=Memory
+-web.statistics.1.content.6.graph.1=memory_free
+-web.statistics.1.content.6.ds_graph_options.memory_free.label=Free Memory (MB)
+-
+-web.statistics.1.content.7.name=Uptime
+-web.statistics.1.content.7.graph.1=uptime
+-web.statistics.1.content.7.ds_graph_options.uptime.label=Uptime (s)
+-
+-web.statistics.1.content.8.name=Temperature
+-web.statistics.1.content.8.graph.1=soc_temp
+-web.statistics.1.content.8.ds_graph_options.soc_temp.label=Core temperature (deg C)
++
++web.statistics.1.content.1.name=CPU Speed
++web.statistics.1.content.1.graph.1=cpu_frequency
++web.statistics.1.content.1.ds_graph_options.cpu_frequency.label=Frequency (MHz)
++web.statistics.1.content.1.ds_graph_options.cpu_frequency.color="#FF7777"
++
++web.statistics.1.content.2.name=CPU Loads
++web.statistics.1.content.2.graph.1=load1
++web.statistics.1.content.2.graph.2=load5
++web.statistics.1.content.2.graph.3=load15
++web.statistics.1.content.2.ds_graph_options.load1.label=Load 1min 
++web.statistics.1.content.2.ds_graph_options.load5.label=Load 5min 
++web.statistics.1.content.2.ds_graph_options.load15.label=Load 15min 
++
++web.statistics.1.content.3.name=Network
++web.statistics.1.content.3.graph.1=net_send
++web.statistics.1.content.3.graph.2=net_received
++web.statistics.1.content.3.ds_graph_options.net_send.label=Upload bandwidth (bits)
++web.statistics.1.content.3.ds_graph_options.net_send.lines={ fill: true }
++web.statistics.1.content.3.ds_graph_options.net_send.color="#FF7777"
++web.statistics.1.content.3.ds_graph_options.net_received.label=Download bandwidth (bits)
++web.statistics.1.content.3.ds_graph_options.net_received.lines={ fill: true }
++web.statistics.1.content.3.ds_graph_options.net_received.color="#77FF77"
++
++web.statistics.1.content.4.name=Disks - boot
++web.statistics.1.content.4.graph.1=sdcard_boot_total
++web.statistics.1.content.4.graph.2=sdcard_boot_used
++web.statistics.1.content.4.ds_graph_options.sdcard_boot_total.label=Size of /boot (MB)
++web.statistics.1.content.4.ds_graph_options.sdcard_boot_total.color="#FF7777"
++web.statistics.1.content.4.ds_graph_options.sdcard_boot_used.label=Used on /boot (MB)
++web.statistics.1.content.4.ds_graph_options.sdcard_boot_used.lines={ fill: true }
++web.statistics.1.content.4.ds_graph_options.sdcard_boot_used.color="#7777FF"
++
++web.statistics.1.content.5.name=Disks - root
++web.statistics.1.content.5.graph.1=sdcard_root_total
++web.statistics.1.content.5.graph.2=sdcard_root_used
++web.statistics.1.content.5.ds_graph_options.sdcard_root_total.label=Size of / (MB)
++web.statistics.1.content.5.ds_graph_options.sdcard_root_total.color="#FF7777"
++web.statistics.1.content.5.ds_graph_options.sdcard_root_used.label=Used on / (MB)
++web.statistics.1.content.5.ds_graph_options.sdcard_root_used.lines={ fill: true }
++web.statistics.1.content.5.ds_graph_options.sdcard_root_used.color="#7777FF"
++
++web.statistics.1.content.7.name=Swap
++web.statistics.1.content.7.graph.1=swap_total
++web.statistics.1.content.7.graph.2=swap_used
++web.statistics.1.content.7.ds_graph_options.swap_total.label=Swap size (MB)
++web.statistics.1.content.7.ds_graph_options.swap_total.color="#FF7777"
++web.statistics.1.content.7.ds_graph_options.swap_used.label=Swap used (MB)
++web.statistics.1.content.7.ds_graph_options.swap_used.lines={ fill: true }
++web.statistics.1.content.7.ds_graph_options.swap_used.color="#7777FF"
++
++web.statistics.1.content.8.name=Memory
++web.statistics.1.content.8.graph.1=memory_free
++web.statistics.1.content.8.graph.2=memory_used
++web.statistics.1.content.8.graph.3=memory_total
++web.statistics.1.content.8.graph.4=memory_gpu
++#web.statistics.1.content.8.graph.5=tmpfs_ram_total
++#web.statistics.1.content.8.graph.6=tmpfs_ram_used
++web.statistics.1.content.8.ds_graph_options.memory_free.label=Free Memory (MB)
++web.statistics.1.content.8.ds_graph_options.memory_free.color="#77FF77"
++web.statistics.1.content.8.ds_graph_options.memory_used.label=Used Memory (MB)
++web.statistics.1.content.8.ds_graph_options.memory_used.color="#FF7777"
++web.statistics.1.content.8.ds_graph_options.memory_total.label=Total Memory (MB)
++web.statistics.1.content.8.ds_graph_options.memory_total.color="#7777FF"
++web.statistics.1.content.8.ds_graph_options.memory_gpu.label=GPU Memory (MB)
++web.statistics.1.content.8.ds_graph_options.memory_gpu.lines={ fill: true }
++web.statistics.1.content.8.ds_graph_options.memory_gpu.color="#FFFF77"
++#web.statistics.1.content.8.ds_graph_options.tmpfs_ram_total.label=Size of /mnt/ram (MB)
++#web.statistics.1.content.8.ds_graph_options.tmpfs_ram_total.color="#77FFFF"
++#web.statistics.1.content.8.ds_graph_options.tmpfs_ram_used.label=Used on /mnt/ram (MB)
++#web.statistics.1.content.8.ds_graph_options.tmpfs_ram_used.color="#FF77FF"
++
++web.statistics.1.content.9.name=Uptime
++web.statistics.1.content.9.graph.1=uptime
++web.statistics.1.content.9.ds_graph_options.uptime.label=Uptime (s)
++
++web.statistics.1.content.10.name=Temperature
++web.statistics.1.content.10.graph.1=soc_temp
++web.statistics.1.content.10.ds_graph_options.soc_temp.label=Core temperature (deg C)
+ 
diff --git a/www-apps/rpi-monitor/files/rpimonitor.initd b/www-apps/rpi-monitor/files/rpimonitor.initd
index 68d34c89..4a67db71 100644
--- a/www-apps/rpi-monitor/files/rpimonitor.initd
+++ b/www-apps/rpi-monitor/files/rpimonitor.initd
@@ -1,4 +1,5 @@
 #!/sbin/runscript
+# Copyright (c) 2013 Stuart Shelton <stuart@shelton.me>
 # Distributed under the terms of the GNU General Public License v2
 
 PERL="$( type -pf perl )"
@@ -12,13 +13,27 @@ depend() {
 }
 
 start() {
-	ebegin "Starting RPI Monitor"
+	[[ -x "$PERL" ]] || { eerror "Cannot locate perl binary" ; return 1 ; }
+
+	ebegin "Starting RPi Monitor"
 	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $PERL -- $DAEMON $DAEMON_ARGS
-	eend $? "Unable to start Monitor"
+	eend $? "Unable to start RPi Monitor"
 }
 
 stop() {
-	ebegin "Stopping RPI Monitor"
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --interpreted --exec $PERL $DAEMON
-	eend $? "Unable to stop Monitor"
+	local pid pids rc
+	[[ -r "$PIDFILE" ]] && pids="$( cat "$PIDFILE" )"
+
+	ebegin "Stopping RPi Monitor"
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --exec $PERL
+	rc=$?
+	[[ -n "$pids" ]] && for pid in $pids; do
+		ps -o args= $pid | grep -q "${PIDFILE}$" && {
+			eindent
+			einfo "Sending HUP signal to child $pid ..."
+			kill -HUP $pid
+			eoutdent
+		}
+	done
+	eend $rc "Unable to stop RPi Monitor"
 }
diff --git a/www-apps/rpi-monitor/rpi-monitor-2.2.ebuild b/www-apps/rpi-monitor/rpi-monitor-2.2.ebuild
index 07ca6b19..b26a0dc7 100644
--- a/www-apps/rpi-monitor/rpi-monitor-2.2.ebuild
+++ b/www-apps/rpi-monitor/rpi-monitor-2.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright (c) 2013 Stuart Shelton <stuart@shelton.me>
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
 
 inherit eutils
 
-DESCRIPTION="RPi-Monitor always keep an eye on your Raspberry Pi"
+DESCRIPTION="RPi-Monitor - always keep an eye on your Raspberry Pi"
 HOMEPAGE="http://rpi-experiences.blogspot.fr"
 SRC_URI="https://github.com/XavierBerger/RPi-Monitor/archive/v${PV}.zip -> ${P}.zip
 	https://github.com/XavierBerger/RPi-Monitor-deb/archive/v${PV}.zip -> ${PN}-deb-${PV}.zip"