[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 43f4c938c18775afd3ed03295c1dbdbca588d761

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 43f4c938c18775afd3ed03295c1dbdbca588d761

[git]

[-- Attachment #1: Type: text/plain, Size: 3217 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, thirteen has been updated
       via  43f4c938c18775afd3ed03295c1dbdbca588d761 (commit)
       via  ceffe9bdf29d9e86fb7b8fe6ab65505e6e76eb24 (commit)
      from  5e374e547d153a8998110275ec2f5720e559d5b6 (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 43f4c938c18775afd3ed03295c1dbdbca588d761
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Nov 24 14:22:14 2012 +0100

    ipsec: Shut up strongswan logging.
    
    Just log the basic stuff.

commit ceffe9bdf29d9e86fb7b8fe6ab65505e6e76eb24
Author: Daniel Weismueller <whytea(a)ipfire.org>
Date:   Sat Nov 24 14:03:44 2012 +0100

    cpufreq: Fix loading of cpufreq modules with newer kernels.

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

Summary of changes:
 config/rootfiles/core/65/update.sh | 3 +++
 html/cgi-bin/vpnmain.cgi           | 3 +++
 src/initscripts/init.d/cpufreq     | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh
index dbd38c4..40d79a8 100644
--- a/config/rootfiles/core/65/update.sh
+++ b/config/rootfiles/core/65/update.sh
@@ -172,6 +172,9 @@ fi
 # Remove preloading libsafe.
 rm -f /etc/ld.so.preload
 
+# Regenerate ipsec configuration files.
+/srv/web/ipfire/cgi-bin/vpnmain.cgi
+
 #
 # Modify grub.conf
 #
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 91c1249..eaf6f48 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -245,6 +245,9 @@ sub writeipsecfiles {
     flock CONF, 2;
     flock SECRETS, 2;
     print CONF "version 2\n\n";
+    print CONF "config setup\n";
+    print CONF "\tcharondebug=\"dmn 0, mgr 0, ike 0, chd 0, job 0, cfg 0, knl 0, net 0, asn 0, enc 0, lib 0, esp 0, tls 0, tnc 0, imc 0, imv 0, pts 0\"\n";
+    print CONF "\n";
     print CONF "conn %default\n";
     print CONF "\tkeyingtries=%forever\n";
     print CONF "\n";
diff --git a/src/initscripts/init.d/cpufreq b/src/initscripts/init.d/cpufreq
index 093b8b1..0d4cdb9 100644
--- a/src/initscripts/init.d/cpufreq
+++ b/src/initscripts/init.d/cpufreq
@@ -20,8 +20,8 @@ case "${1}" in
 		boot_mesg -n "Starting cpufreq... "
 
 		# try cpufreq hardware depend modules
-		for i in $(find /lib/modules/$(uname -r)/kernel/arch/x86/kernel/cpu/cpufreq \
-		           ! -name speedstep-lib.ko ! -name p4-clockmod.ko | sort -d -r); do
+		for i in $(find /lib/modules/$(uname -r)/kernel/drivers/cpufreq \
+		           ! -name speedstep-lib.ko ! -name p4-clockmod.ko ! -name "cpufreq_*" ! -name mperf.ko | sort -d -r); do
 			module=$(basename $i | cut -d. -f1);
 			modprobe $module > /dev/null 2>&1;
 			if [ ${?} = 0 ]; then


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