X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fstage2;h=0a5ac65c09a3f641d2f549751b8b8b07220bc61b;hb=6033b2710346f9bf4e1182db706775ccde59e5c1;hp=2d2a6459de9424e683b7d643f7af5c9710aa6db5;hpb=5edc06b701548df78adf746bb4023ef61460d957;p=ipfire-2.x.git

diff --git a/lfs/stage2 b/lfs/stage2
index 2d2a6459de..0a5ac65c09 100644
--- 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
@@ -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
@@ -127,6 +128,7 @@ endif
 	-mkdir -pv /var/log/{counter,calamaris}
 	chown nobody.nobody /var/log/calamaris
 	touch /var/log/{btmp,lastlog,wtmp}
+	chmod -v 600 /var/log/btmp
 	chgrp -v utmp /var/log/lastlog
 	chmod -v 664 /var/log/lastlog