Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/update.sh

diff --git a/config/etc/fstab b/config/etc/fstab
index c0f98b3a4df7b259896dd278ff8e9d865c7376a3..4860d6f9444d502d90c9c201717e97ba25c7d3a1 100644 (file)
--- a/config/etc/fstab
+++ b/config/etc/fstab
@@ -10,5 +10,5 @@ sysfs /sys    sysfs   defaults        0       0
 devpts /dev/pts        devpts   gid=4,mode=620  0     0
 #none  /tmp            tmpfs   defaults        0       0
 none   /var/log/rrd    tmpfs   defaults,size=64M       0       0
-none   /var/lock       tmpfs   defaults,size=2M        0       0
+none   /var/lock       tmpfs   defaults,size=8M        0       0
 none   /var/run        tmpfs   defaults,size=2M        0       0

diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn
index 47b42f991b6df109b08b3ea10bca540f93f32337..23742b3d8bdb5adfb2ed8ace5b9fd673c8ace8a6 100644 (file)
--- a/config/rootfiles/common/openvpn
+++ b/config/rootfiles/common/openvpn
@@ -1,3 +1,4 @@
+lib/openvpn-auth-pam.so
 usr/sbin/openvpn
 #usr/share/doc/openvpn
 #usr/share/man/man8/openvpn.8

diff --git a/lfs/openvpn b/lfs/openvpn
index 8c8ad71116c09cc4490799f479ef0b54946d77df..792de60dab18452df2ced2797e156df90d021343 100644 (file)
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -75,6 +75,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && cp -Rvf $(DIR_SRC)/config/ovpn /var/ipfire
+       cd $(DIR_APP)/plugin/auth-pam && make
+       cp -pvf $(DIR_APP)/plugin/auth-pam/openvpn-auth-pam.so /lib/
        -mkdir -vp /var/ipfire/ovpn/ca
        -mkdir -vp /var/ipfire/ovpn/crls
        touch /var/ipfire/ovpn/ovpn-leases.db

diff --git a/src/initscripts/init.d/ntp b/src/initscripts/init.d/ntp
index ef94de153330e5a713acbadc13d149aaf50fdf0e..92f174d8afdd356d3689856ccad5acd2d35bf2b4 100644 (file)
--- a/src/initscripts/init.d/ntp
+++ b/src/initscripts/init.d/ntp
@@ -9,7 +9,7 @@ eval $(/usr/local/bin/readhash /var/ipfire/time/settings)
 case "$1" in
        start)
                if [ "$ENABLESETONBOOT" == "on" ]; then
-                       boot_mesg "Setting time on booot..."
+                       boot_mesg "Setting time on boot..."
                        loadproc /usr/local/bin/settime $(cat /var/ipfire/time/settime.conf)
                fi