X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fstage2;h=0a5ac65c09a3f641d2f549751b8b8b07220bc61b;hb=4d9002279f6cd5c73f0e6092c22ae2bfa49460bb;hp=19d9553797f966ff9135ceaa5a1d0e2cd85309b4;hpb=89b102b3cb672c8f56ad6d8ff240acdab306f88a;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/stage2 b/lfs/stage2
index 19d9553797..0a5ac65c09 100644
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -49,13 +49,13 @@ $(TARGET) :
 	@$(PREBUILD)
 
 	# Create directories
-	-mkdir -pv /{bin,boot,etc/opt,etc/modprobe.d,home,lib,mnt,opt,run}
+	-mkdir -pv /{bin,boot,etc/opt,etc/modprobe.d,home,lib/firmware/brcm,mnt,opt,run}
 	-mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var}
 	-install -dv -m 0750 /root
 	-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
@@ -75,6 +80,7 @@ $(TARGET) :
 
 	# Config files
 	cp -rvf $(DIR_SRC)/config/etc/* /etc;
+	cp -rvf $(DIR_SRC)/config/lib/* /lib;
 	touch /etc/{fs,m}tab
 	echo "$(NAME) v$(VERSION) - $(SLOGAN)" >  /etc/issue
 	echo "===============================" >> /etc/issue
@@ -100,13 +106,17 @@ $(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
 	install -m 755 $(DIR_SRC)/config/firewall/rules.pl \
 		/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
@@ -117,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