X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fstage2;h=4b8f0bc811171cf684618d8754c335de1311db92;hb=HEAD;hp=356060a1f679f4fb78bd47c6a6abba7ad72b08ab;hpb=d29b3c77ac495d5d2307640b5953df86818416b8;p=ipfire-2.x.git

diff --git a/lfs/stage2 b/lfs/stage2
index 356060a1f6..b2ae5d0fff 100644
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -39,7 +39,7 @@ check :
 
 download :
 
-md5 :
+b2 :
 
 ###############################################################################
 # Installation Details
@@ -55,7 +55,7 @@ $(TARGET) :
 	-install -dv -m 1777 /tmp /var/tmp
 	-mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
 	-mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
-	-mkdir -v  /usr/{,local/}share/{misc,terminfo,xt_geoip,zoneinfo}
+	-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; \
@@ -64,10 +64,8 @@ $(TARGET) :
 	# Symlink /var/run -> /run.
 	ln -svf ../run /var/run
 
-ifeq "$(IS_64BIT)" "1"
 	ln -svf lib /lib64
 	ln -svf lib /usr/lib64
-endif
 
 ifeq "$(BUILD_ARCH)" "riscv64"
 	ln -svf . /lib/lp64d
@@ -87,7 +85,8 @@ endif
 	cp -rvf $(DIR_SRC)/config/etc/* /etc;
 	[ ! -d "$(DIR_SRC)/config/etc-$(BUILD_ARCH)" ] || cp -rvf $(DIR_SRC)/config/etc-$(BUILD_ARCH)/* /etc
 	cp -rvf $(DIR_SRC)/config/lib/* /lib;
-	touch /etc/{fs,m}tab
+	touch /etc/fstab
+	ln -s /proc/self/mounts /etc/mtab
 	echo "$(NAME) v$(VERSION) - $(SLOGAN)" >  /etc/issue
 	echo "===============================" >> /etc/issue
 	echo "\n running on \s \r \m"          >> /etc/issue
@@ -113,7 +112,6 @@ endif
 
 	# Move script to correct place.
 	mv -vf /usr/local/bin/openvpn-metrics /usr/sbin/
-	mv -vf /usr/local/bin/ovpn-ccd-convert /usr/sbin/
 	mv -vf /usr/local/bin/captive-cleanup /usr/bin/
 
 	# Install firewall scripts.
@@ -165,4 +163,8 @@ endif
 	-mkdir -pv /opt/pakfire/db/core
 	echo "$(CORE)" > /opt/pakfire/db/core/mine
 
+	# IPblocklist.
+	-mkdir -pv /var/lib/ipblocklist
+	chown nobody:nobody /var/lib/ipblocklist
+
 	@$(POSTBUILD)