[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7b1db453c034fd88217f2f9b38ff1c57a9ec1f52

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7b1db453c034fd88217f2f9b38ff1c57a9ec1f52

[git]

[-- Attachment #1: Type: text/plain, Size: 2901 bytes --]

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  7b1db453c034fd88217f2f9b38ff1c57a9ec1f52 (commit)
       via  f7e3815db2c732e724d450d1092ed19cfe92b773 (commit)
       via  c7929cf54604d989986ddb8b6bbf491955c48258 (commit)
      from  9c55c65e050d60c2604490247a4f7ccb0b0032b5 (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 7b1db453c034fd88217f2f9b38ff1c57a9ec1f52
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Jul 21 20:33:36 2013 +0200

    network: red: Remove duplicate MRU option.

commit f7e3815db2c732e724d450d1092ed19cfe92b773
Merge: c7929cf 9c55c65
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Jul 16 23:06:56 2013 +0200

    Merge branch 'master' into core71

commit c7929cf54604d989986ddb8b6bbf491955c48258
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Jul 16 18:29:48 2013 +0200

    core71: stop/start squid at update.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/71/update.sh    | 3 ++-
 src/initscripts/init.d/networking/red | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/71/update.sh b/config/rootfiles/core/71/update.sh
index 8990b97..e45ccd8 100644
--- a/config/rootfiles/core/71/update.sh
+++ b/config/rootfiles/core/71/update.sh
@@ -39,7 +39,7 @@ cp -f /etc/snort/snort.conf /etc/snort/snort.conf.backup
 #
 #Stop services
 /etc/init.d/snort stop
-
+/etc/init.d/squid stop
 #
 #Remove old usb-modeswitch file
 rm /usr/share/usb_modeswitch/0e8d:0002
@@ -59,6 +59,7 @@ grep "^include $RULE_PATH" /etc/snort/snort.conf.backup >> /etc/snort/snort.conf
 
 #
 #Start services
+/etc/init.d/squid start
 /etc/init.d/snort start
 
 #
diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index b33c03f..28df551 100644
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -389,7 +389,7 @@ case "${1}" in
 			#
 			PPP_STD_OPTIONS="$PLUGOPTS $DNS defaultroute noipdefault noauth"
 			PPP_STD_OPTIONS+=" default-asyncmap hide-password nodetach"
-			PPP_STD_OPTIONS+=" mru ${MRU} noaccomp nodeflate nopcomp novj novjccomp"
+			PPP_STD_OPTIONS+=" noaccomp nodeflate nopcomp novj novjccomp"
 			PPP_STD_OPTIONS+=" nobsdcomp user ${USERNAME} lcp-echo-interval 20"
 			PPP_STD_OPTIONS+=" lcp-echo-failure 5 ${AUTH}"
 


hooks/post-receive
--
IPFire 2.x development tree