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, next has been updated via 29fa14154fc211a4eb91d0c75c041b74fc0bf1fa (commit) via fcfd54ba9b883d0776f320e93ef422a5b2c3c73d (commit) via 204cab0218cfbc1abbbdba2ac60f862ae6bca42b (commit) from 3033567376ee335545ac2b177c826ca2f287b446 (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 29fa14154fc211a4eb91d0c75c041b74fc0bf1fa Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jul 8 19:58:11 2013 +0200
functions.network: fix cursor position at status write.
commit fcfd54ba9b883d0776f320e93ef422a5b2c3c73d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Jul 7 00:09:06 2013 +0200
dnsmasq: kill already old instances before start.
commit 204cab0218cfbc1abbbdba2ac60f862ae6bca42b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jul 6 22:26:08 2013 +0200
wireless-client: add cgi to iso.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/apache2 | 1 + config/rootfiles/core/71/filelists/files | 1 + src/initscripts/init.d/dnsmasq | 3 +++ src/initscripts/init.d/networking/functions.network | 2 ++ 4 files changed, 7 insertions(+)
Difference in files: diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 802ddcb..9be3581 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1431,6 +1431,7 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/cgi-bin/wakeonlan.cgi srv/web/ipfire/cgi-bin/webaccess.cgi srv/web/ipfire/cgi-bin/wireless.cgi +srv/web/ipfire/cgi-bin/wirelessclient.cgi srv/web/ipfire/cgi-bin/xtaccess.cgi srv/web/ipfire/html var/updatecache diff --git a/config/rootfiles/core/71/filelists/files b/config/rootfiles/core/71/filelists/files index b15981f..fe6b73d 100644 --- a/config/rootfiles/core/71/filelists/files +++ b/config/rootfiles/core/71/filelists/files @@ -3,6 +3,7 @@ etc/issue var/ipfire/general-functions.pl var/ipfire/header.pl var/ipfire/menu.d/10-system.menu +etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/wlanclient etc/rc.d/init.d/networking/functions.network etc/rc.d/init.d/networking/wpa_supplicant.exe diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq index 1185921..1b2c0c2 100644 --- a/src/initscripts/init.d/dnsmasq +++ b/src/initscripts/init.d/dnsmasq @@ -24,6 +24,9 @@ SHOW_SRV=1
case "${1}" in start) + # kill already running copy of dnsmasq... + killproc /usr/sbin/dnsmasq 2>&1 > /dev/null + boot_mesg "Starting Domain Name Service Proxy..." eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) diff --git a/src/initscripts/init.d/networking/functions.network b/src/initscripts/init.d/networking/functions.network index 26cc65c..b1ce220 100755 --- a/src/initscripts/init.d/networking/functions.network +++ b/src/initscripts/init.d/networking/functions.network @@ -142,11 +142,13 @@ dhcpcd_stop() { # Display console message, depended on the exit code # of the stopped dhcpcd. if [ "${ret}" -eq 0 ]; then + boot_mesg echo_ok elif [ "${ret}" -eq 1 ]; then boot_mesg "failed to stop dhcpcd!" ${WARNING} echo_warning else + boot_mesg echo_failure fi fi
hooks/post-receive -- IPFire 2.x development tree