From 5b4fc4c8493747af7a6772e1085ef0d45c9ab6af Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 10 Sep 2021 11:12:03 +0000 Subject: [PATCH] core160: add ssh changes and stop/start ipsec at update Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/160/filelists/libssh | 1 + config/rootfiles/core/160/filelists/openssh | 1 + config/rootfiles/oldcore/151/update.sh | 21 ++++++++++----------- 3 files changed, 12 insertions(+), 11 deletions(-) create mode 120000 config/rootfiles/core/160/filelists/libssh create mode 120000 config/rootfiles/core/160/filelists/openssh diff --git a/config/rootfiles/core/160/filelists/libssh b/config/rootfiles/core/160/filelists/libssh new file mode 120000 index 0000000000..ecbb67053a --- /dev/null +++ b/config/rootfiles/core/160/filelists/libssh @@ -0,0 +1 @@ +../../../common/libssh \ No newline at end of file diff --git a/config/rootfiles/core/160/filelists/openssh b/config/rootfiles/core/160/filelists/openssh new file mode 120000 index 0000000000..d8c77fd8e7 --- /dev/null +++ b/config/rootfiles/core/160/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/151/update.sh b/config/rootfiles/oldcore/151/update.sh index 5fb05488b5..cec3066c1d 100644 --- a/config/rootfiles/oldcore/151/update.sh +++ b/config/rootfiles/oldcore/151/update.sh @@ -17,14 +17,14 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2020 IPFire-Team . # +# Copyright (C) 2021 IPFire-Team . # # # ############################################################################ # . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 -core=151 +core=160 # Remove old core updates from pakfire cache to save space... for (( i=1; i<=$core; i++ )); do @@ -32,13 +32,13 @@ for (( i=1; i<=$core; i++ )); do done # Remove files -rm -rfv \ - /usr/lib/perl5/site_perl/5.30.0/Locale \ - /usr/lib/perl5/site_perl/5.30.0/*/Net/DNS \ - /usr/lib/perl5/site_perl/5.30.0/*/Net/DNS.pm +rm -vf /lib/udev/rules.d/85-regulatory.rules +rm -vf /sbin/crda +rm -vf /sbin/regdbdump +rm -vf /usr/lib/libreg.so # Stop services -/etc/init.d/ipsec stop +/etc/init.d/ipsec start # Extract files extract_files @@ -46,6 +46,9 @@ extract_files # update linker config ldconfig +# restart init (glibc update) +telinit u + # Update Language cache /usr/local/bin/update-lang-cache @@ -60,10 +63,6 @@ ldconfig if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then /etc/init.d/ipsec start fi -/etc/init.d/collectd restart - -# Reload sysctl.conf -sysctl -p # This update needs a reboot... #touch /var/run/need_reboot -- 2.39.5