From 5d747ddb70e74c9f5503618cc8aaa79b8f728cb3 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 17 Mar 2021 10:09:24 +0100 Subject: [PATCH 1/4] core155: fix reboot after update new init has moved the path of the initctl pipe from /dev to /run Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/155/update.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh index 1434ce666..b074d24b9 100644 --- a/config/rootfiles/core/155/update.sh +++ b/config/rootfiles/core/155/update.sh @@ -60,6 +60,9 @@ extract_files # update linker config ldconfig +# Create a symlink from /run/initctl to /dev/initctl +ln -s /dev/initctl /run/initctl + # Disable all connection tracking helper sed -E -e "s/^CONNTRACK_(.*?)=on/CONNTRACK_\1=off/g" \ -i /var/ipfire/optionsfw/settings From 9758b336639adfa849bfbffcec396304448283f1 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 17 Mar 2021 10:11:01 +0100 Subject: [PATCH 2/4] core155: need a reboot Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/155/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh index b074d24b9..68651ad5f 100644 --- a/config/rootfiles/core/155/update.sh +++ b/config/rootfiles/core/155/update.sh @@ -82,7 +82,7 @@ sed -E -e "s/^CONNTRACK_(.*?)=on/CONNTRACK_\1=off/g" \ /etc/init.d/suricata restart # This update needs a reboot... -#touch /var/run/need_reboot +touch /var/run/need_reboot # Finish /etc/init.d/fireinfo start From 14df78791b554b1947174ac3e34949e3839abafb Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 17 Mar 2021 10:14:39 +0100 Subject: [PATCH 3/4] core155: remove old libcrypt Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/155/update.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh index 68651ad5f..fbee949bc 100644 --- a/config/rootfiles/core/155/update.sh +++ b/config/rootfiles/core/155/update.sh @@ -33,6 +33,8 @@ done # Remove files rm -vrf \ + /lib/libcrypt.so.1 \ + /lib/libcrypt-2.32.so \ /lib/libhistory.so.6 \ /lib/libhistory.so.6.3 \ /lib/libreadline.so.6 \ From 2db2b593247967a76f5492a235b8ffd93d97c8ba Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 17 Mar 2021 10:19:10 +0100 Subject: [PATCH 4/4] core155: apply local ssh config Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/155/update.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh index fbee949bc..90647b253 100644 --- a/config/rootfiles/core/155/update.sh +++ b/config/rootfiles/core/155/update.sh @@ -69,6 +69,9 @@ ln -s /dev/initctl /run/initctl sed -E -e "s/^CONNTRACK_(.*?)=on/CONNTRACK_\1=off/g" \ -i /var/ipfire/optionsfw/settings +# Apply local configuration to sshd_config +/usr/local/bin/sshctrl + # Update Language cache /usr/local/bin/update-lang-cache