This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via 3e0cef2a2673b6c434e10bc656b99a5feb550ff4 (commit) via b0849c98600896b22969ada84e04537e9847f411 (commit) via e9ef343f6de2d22519ea5021e184d2eae5437421 (commit) via 0652dff7e3c019ce551c89b15c79c1112928767f (commit) from 712829a1b84985bd800c84298f81a116d3a39810 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 3e0cef2a2673b6c434e10bc656b99a5feb550ff4 Merge: b0849c9 712829a Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Dec 11 10:55:03 2010 +0100
Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
commit b0849c98600896b22969ada84e04537e9847f411 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Dec 11 10:54:43 2010 +0100
fireinfo: Send profile by default (for beta only).
commit e9ef343f6de2d22519ea5021e184d2eae5437421 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Dec 11 10:52:30 2010 +0100
Enable sending of profile on first connection startup.
commit 0652dff7e3c019ce551c89b15c79c1112928767f Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Dec 11 10:40:35 2010 +0100
Add crontab entry for fireinfo.
-----------------------------------------------------------------------
Summary of changes: config/cron/crontab | 3 +++ config/rootfiles/common/fireinfo | 1 + config/rootfiles/common/initscripts | 1 + lfs/fireinfo | 3 +++ .../init.d/networking/red.up/99-fireinfo | 13 +++++++++++++ 5 files changed, 21 insertions(+), 0 deletions(-) create mode 100644 src/initscripts/init.d/networking/red.up/99-fireinfo
Difference in files: diff --git a/config/cron/crontab b/config/cron/crontab index cbc92cb..16a5b96 100644 --- 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 ea327e3..e4073dd 100644 --- 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 90ecf19..3bd4142 100644 --- 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 8d45d6b..7db029a 100644 --- 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 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
hooks/post-receive -- IPFire 2.x development tree