samba: update to 4.13.0

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

diff --git a/lfs/stage2 b/lfs/stage2
index 7e8dfe3169d09cad8763d82e6e7e5ec7e2d3fee7..2863d6b697590bce5e6755302412af0df646e3b6 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  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        #
@@ -105,6 +105,7 @@ endif
        done
 
        # 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/ovpn-collectd-convert /usr/sbin/
        mv -vf /usr/local/bin/captive-cleanup /usr/bin/
@@ -115,8 +116,8 @@ endif
                /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
+       install -m 755 $(DIR_SRC)/config/firewall/ipsec-policy \
+               /usr/lib/firewall/ipsec-policy
 
        # Nobody user
        -mkdir -p /home/nobody
@@ -145,8 +146,17 @@ endif
        # System release
        echo "$(SYSTEM_RELEASE)" > /etc/system-release
 
+       # OS release
+       : >/etc/os-release
+       echo "NAME=\"$(NAME)\"" >> /etc/os-release
+       echo "VERSION=\"$(VERSION)\"" >> /etc/os-release
+       echo "ID=$(SNAME)" >> /etc/os-release
+       echo "VERSION_ID=2" >> /etc/os-release
+       echo "PRETTY_NAME=\"$(SYSTEM_RELEASE)\"" >> /etc/os-release
+       echo "ANSI_COLOR=\"0:31\"" >> /etc/os-release
+
        # Pakfire
        -mkdir -pv /opt/pakfire/db/core
-       echo "$(PAKFIRE_CORE)" > /opt/pakfire/db/core/mine
+       echo "$(CORE)" > /opt/pakfire/db/core/mine
 
        @$(POSTBUILD)