Merge remote-tracking branch 'origin/next'

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

diff --git a/lfs/stage2 b/lfs/stage2
index ec5d1170d972eb587045e954ae27bcaff3d1fbe9..4ab5edd8b59909e849d7446f992e0714800e93b2 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -64,18 +64,18 @@ $(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
 
        # Symlinks
        # for this reason, stage2 rebuild will broke the iso:perl, grubbatch
-       -ln -sv /tools/bin/{bash,cat,echo,pwd,stty} /bin
-       -ln -sv /tools/bin/perl /usr/bin
-       -ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
-       -ln -sv /tools/lib/libstdc++.so{,.6} /usr/lib
-       sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
+       -ln -sv $(TOOLS_DIR)/bin/{bash,cat,echo,pwd,stty} /bin
+       -ln -sv $(TOOLS_DIR)/bin/perl /usr/bin
+       -ln -sv $(TOOLS_DIR)/lib/libgcc_s.so{,.1} /usr/lib
+       -ln -sv $(TOOLS_DIR)/lib/libstdc++.so{,.6} /usr/lib
+       sed 's@$(TOOLS_DIR)@/usr@' $(TOOLS_DIR)/lib/libstdc++.la > /usr/lib/libstdc++.la
        -ln -sv bash /bin/sh
 
        # Config files
@@ -107,6 +107,7 @@ endif
        # 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
@@ -126,7 +127,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