Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

diff --git a/config/cron/crontab b/config/cron/crontab
index cbc92cbc6f02fd4b0353f0f7596976aa0eecd43f..16a5b960c6e29b46c1823d182dcf04d70c4a71c8 100644 (file)
--- a/config/cron/crontab
+++ b/config/cron/crontab
@@ -52,3 +52,6 @@ HOME=/
 
 # Reset Dialup Statistics
 &bootrun 0 0 1 * *     /usr/local/bin/dialctrl.pl reset
+
+# fireinfo
+%nightly,random * 23-4 /usr/bin/sendprofile >/dev/null 2>&1

diff --git a/config/rootfiles/common/fireinfo b/config/rootfiles/common/fireinfo
index ea327e3536b31836be36923d78e259898813788c..e4073dd0089830d6ea1f6b5fbafd02c808fdacde 100644 (file)
--- a/config/rootfiles/common/fireinfo
+++ b/config/rootfiles/common/fireinfo
@@ -11,3 +11,4 @@ usr/lib/python2.7/site-packages/fireinfo/hypervisor.py
 usr/lib/python2.7/site-packages/fireinfo/hypervisor.pyc
 usr/lib/python2.7/site-packages/fireinfo/system.py
 usr/lib/python2.7/site-packages/fireinfo/system.pyc
+var/ipfire/main/send_profile

diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
index 90ecf19a98ec61021c3975bb1e70f28bacdf65f5..3bd4142ccc0d32dbd3a75feb18ff4e4cfcee4384 100644 (file)
--- a/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@ -86,6 +86,7 @@ etc/rc.d/init.d/networking/red.up/40-ipac
 etc/rc.d/init.d/networking/red.up/50-ipsec
 etc/rc.d/init.d/networking/red.up/50-ovpn
 etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
+etc/rc.d/init.d/networking/red.up/99-fireinfo
 etc/rc.d/init.d/networking/red.up/99-pakfire-update
 #etc/rc.d/init.d/nfs-server
 etc/rc.d/init.d/ntp

diff --git a/lfs/fireinfo b/lfs/fireinfo
index 8d45d6bcc5009b76826e1de6beccd163c079528b..7db029aae5ec6347015c33385b3a5abaff84c589 100644 (file)
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -76,5 +76,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Remove egg-info
        rm -rvf /usr/lib/python*/site-packages/fireinfo*.egg-info
 
+       # XXX Set flag to send profile.
+       touch /var/ipfire/main/send_profile
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/initscripts/init.d/networking/red.up/99-fireinfo b/src/initscripts/init.d/networking/red.up/99-fireinfo
new file mode 100644 (file)
index 0000000..089affc
--- /dev/null
+++ b/src/initscripts/init.d/networking/red.up/99-fireinfo
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Send the fireinfo profile after first boot (if enabled)
+
+INDICATION="/var/run/fireinfo"
+
+if [ ! -e "${INDICATION}" ]; then
+       /usr/bin/sendprofile >/dev/null 2>&1
+
+       touch ${INDICATION}
+fi
+
+exit 0