Merge branch 'master' into next

[ipfire-2.x.git] / lfs / stage2

diff --git a/lfs/stage2 b/lfs/stage2
index 3244fa36fa79afc8b946a100173c9ce9784ee5c9..b70bde78a4e273bc37444d3fc1aea2b986657470 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -64,7 +64,7 @@ $(TARGET) :
        # Symlink /var/run -> /run.
        ln -svf ../run /var/run
 
-ifeq "$(MACHINE)" "x86_64"
+ifeq "$(IS_64BIT)" "1"
        ln -svf lib /lib64
        ln -svf lib /usr/lib64
 endif
@@ -114,6 +114,8 @@ endif
                /usr/lib/firewall/rules.pl
        install -m 644 $(DIR_SRC)/config/firewall/firewall-lib.pl \
                /usr/lib/firewall/firewall-lib.pl
+       install -m 755 $(DIR_SRC)/config/firewall/ipsec-block \
+               /usr/lib/firewall/ipsec-block
 
        # Nobody user
        -mkdir -p /home/nobody
@@ -124,7 +126,8 @@ endif
        -mkdir -pv /var/{opt,cache,lib/{misc,locate},local}
        -mkdir -pv /var/log/{counter,calamaris}
        chown nobody.nobody /var/log/calamaris
-       touch /var/log/{btmp,lastlog,wtmp,net-traffic.log}
+       touch /var/log/{btmp,lastlog,wtmp}
+       chmod -v 600 /var/log/btmp
        chgrp -v utmp /var/log/lastlog
        chmod -v 664 /var/log/lastlog