X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fstage2;h=53f81d1b46c7cfbe3beace327c31505e96c7c478;hp=5c15f4183778d83ede77ab86fa36f48cda25d0ed;hb=30986dbf03b2ce231f3a53989d4d81ec7ccb1681;hpb=ac14b325e03276f9e17e334b03a3d3129903bac7

diff --git a/lfs/stage2 b/lfs/stage2
index 5c15f41837..53f81d1b46 100644
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -49,17 +49,20 @@ $(TARGET) :
 	@$(PREBUILD)
 
 	# Create directories
-	-mkdir -pv /{bin,boot,etc/opt,etc/modprobe.d,home,lib,mnt,opt}
+	-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,sbin,src}
+	-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 -pv /usr/{,local/}share/man/man{1..8}
 	#-for dir in /usr /usr/local; do \
 	#  ln -sv share/{man,doc,info} $$dir; \
 	#done
+
+	# Symlink /var/run -> /run.
+	ln -svf ../run /var/run
 	
 	# Symlinks
 	# for this reason, stage2 rebuild will broke the iso:perl, grubbatch
@@ -72,7 +75,8 @@ $(TARGET) :
 
 	# Config files
 	cp -rvf $(DIR_SRC)/config/etc/* /etc;
-	touch /etc/mtab
+	cp -rvf $(DIR_SRC)/config/lib/* /lib;
+	touch /etc/{fs,m}tab
 	echo "$(NAME) v$(VERSION) - $(SLOGAN)" >  /etc/issue
 	echo "===============================" >> /etc/issue
 	echo "\n running on \s \r \m"          >> /etc/issue
@@ -97,19 +101,27 @@ $(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/
+	
+	# 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
 
 	# Nobody user
 	-mkdir -p /home/nobody
 	chown -R nobody:nobody /home/nobody
 
 	# Create /var dirs and files
-	-mkdir -v /var/{lock,log,mail,run,spool,empty}
+	-mkdir -v /var/{lock,log,mail,spool,empty}
 	-mkdir -pv /var/{opt,cache,lib/{misc,locate},local}
 	-mkdir -pv /var/log/{counter,calamaris}
 	chown nobody.nobody /var/log/calamaris
-	touch /var/run/utmp /var/log/{btmp,lastlog,wtmp,net-traffic.log}
-	chgrp -v utmp /var/run/utmp /var/log/lastlog
-	chmod -v 664 /var/run/utmp /var/log/lastlog
+	touch /var/log/{btmp,lastlog,wtmp,net-traffic.log}
+	chgrp -v utmp /var/log/lastlog
+	chmod -v 664 /var/log/lastlog
 
 	# Permissions
 	chmod 0711 /var/empty