diff --git a/config/backup/backup.pl b/config/backup/backup.pl index a2337cf23..2e9c0c573 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -19,6 +19,8 @@ # # ############################################################################### +shopt -s nullglob + NOW="$(date "+%Y-%m-%d-%H:%M")" list_addons() { @@ -34,12 +36,14 @@ list_addons() { process_includes() { local include - for include in $@; do + # Skip any empty line (which will include /) + [ -n "${include}" ] || continue + local file while read -r file; do - for file in ${file}; do - if [ -e "/${file}" ]; then + for file in /${file}; do + if [ -e "${file}" ]; then echo "${file}" fi done diff --git a/config/rootfiles/oldcore/165/filelists/aarch64/u-boot b/config/rootfiles/oldcore/165/filelists/aarch64/u-boot new file mode 120000 index 000000000..2a16bdbfe --- /dev/null +++ b/config/rootfiles/oldcore/165/filelists/aarch64/u-boot @@ -0,0 +1 @@ +../../../../common/aarch64/u-boot \ No newline at end of file diff --git a/config/rootfiles/oldcore/165/filelists/core-files b/config/rootfiles/oldcore/165/filelists/core-files new file mode 100644 index 000000000..0dec37e53 --- /dev/null +++ b/config/rootfiles/oldcore/165/filelists/core-files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +etc/os-release +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/oldcore/165/filelists/files b/config/rootfiles/oldcore/165/filelists/files index d03e3f529..962a94e11 100644 --- a/config/rootfiles/oldcore/165/filelists/files +++ b/config/rootfiles/oldcore/165/filelists/files @@ -16,6 +16,7 @@ srv/web/ipfire/cgi-bin/wirelessclient.cgi srv/web/ipfire/html/themes/ipfire/include/css/style.css usr/lib/firewall/firewall-lib.pl usr/lib/firewall/rules.pl +usr/local/bin/update-ids-ruleset usr/local/bin/update-location-database usr/sbin/setup var/ipfire/ids-functions.pl diff --git a/config/rootfiles/oldcore/165/update.sh b/config/rootfiles/oldcore/165/update.sh index f505628e4..ffb552c80 100644 --- a/config/rootfiles/oldcore/165/update.sh +++ b/config/rootfiles/oldcore/165/update.sh @@ -129,6 +129,14 @@ ldconfig telinit u /etc/rc.d/init.d/firewall restart +# Fix ownership of classification file. +chown nobody:nobody /usr/share/suricata/classification.config + +# Rebuild IPS rules +rm -vf /tmp/ids_page_locked +perl -e "require '/var/ipfire/ids-functions.pl'; &IDS::oinkmaster();" +/etc/init.d/suricata reload + # This update needs a reboot... touch /var/run/need_reboot