X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fstage2;h=b70bde78a4e273bc37444d3fc1aea2b986657470;hb=9a9cb82c4f73b7ec11a6ebb4e2f50cd319f25aa3;hp=53f81d1b46c7cfbe3beace327c31505e96c7c478;hpb=0fbba54e825ad4d21762e0deb788ec6614d0e744;p=ipfire-2.x.git

diff --git a/lfs/stage2 b/lfs/stage2
index 53f81d1b46..b70bde78a4 100644
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -55,7 +55,7 @@ $(TARGET) :
 	-install -dv -m 1777 /tmp /var/tmp
 	-mkdir -pv /usr/{,local/}{bin,include,lib{,/sse2},sbin,src}
 	-mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
-	-mkdir -v  /usr/{,local/}share/{misc,terminfo,zoneinfo}
+	-mkdir -v  /usr/{,local/}share/{misc,terminfo,xt_geoip,zoneinfo}
 	-mkdir -pv /usr/{,local/}share/man/man{1..8}
 	#-for dir in /usr /usr/local; do \
 	#  ln -sv share/{man,doc,info} $$dir; \
@@ -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
@@ -109,6 +114,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 +126,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