Merge branch 'temp-stevee-ipblocklist-final' into next

[ipfire-2.x.git] / lfs / stage2

diff --git a/lfs/stage2 b/lfs/stage2
index 9f93babe2f046e718d90fa12e765048935b2f1ee..3d6970b826a016767106ee5ad27929390bf93916 100644 (file)
--- 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        #
@@ -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; \
@@ -87,7 +87,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
@@ -164,4 +165,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)