Actually build bootstrap

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

diff --git a/lfs/stage2 b/lfs/stage2
index 3203983e287a386515a787e278d41f2bde2a4677..0a5ac65c09a3f641d2f549751b8b8b07220bc61b 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -63,7 +63,12 @@ $(TARGET) :
 
        # Symlink /var/run -> /run.
        ln -svf ../run /var/run
-       
+
+ifeq "$(IS_64BIT)" "1"
+       ln -svf lib /lib64
+       ln -svf lib /usr/lib64
+endif
+
        # Symlinks
        # for this reason, stage2 rebuild will broke the iso:perl, grubbatch
        -ln -sv /tools/bin/{bash,cat,echo,pwd,stty} /bin
@@ -102,6 +107,7 @@ $(TARGET) :
        # Move script to correct place.
        mv -vf /usr/local/bin/ovpn-ccd-convert /usr/sbin/
        mv -vf /usr/local/bin/ovpn-collectd-convert /usr/sbin/
+       mv -vf /usr/local/bin/captive-cleanup /usr/bin/
        
        # Install firewall scripts.
        mkdir -pv /usr/lib/firewall
@@ -109,6 +115,8 @@ $(TARGET) :
                /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
@@ -119,7 +127,8 @@ $(TARGET) :
        -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