From b1dc936cc60e651773095ceaadbfcbeed2666f84 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 14 Nov 2019 17:28:38 +0000 Subject: [PATCH] rename core138 -> core139 to insert a emergency core update Signed-off-by: Arne Fitzenreiter --- .../core/137/filelists/IO-Socket-SSL | 1 - .../rootfiles/core/137/filelists/Net_SSLeay | 1 - .../core/137/filelists/aarch64/linux | 1 - .../core/137/filelists/aarch64/linux-initrd | 1 - .../filelists/armv5tel/linux-initrd-kirkwood | 1 - .../137/filelists/armv5tel/linux-initrd-multi | 1 - .../137/filelists/armv5tel/linux-kirkwood | 1 - .../core/137/filelists/armv5tel/linux-multi | 1 - config/rootfiles/core/137/filelists/bind | 1 - config/rootfiles/core/137/filelists/collectd | 1 - config/rootfiles/core/137/filelists/dhcpcd | 1 - config/rootfiles/core/137/filelists/files | 22 ----- .../rootfiles/core/137/filelists/i586/linux | 1 - .../core/137/filelists/i586/linux-initrd | 1 - config/rootfiles/core/137/filelists/iproute2 | 1 - config/rootfiles/core/137/filelists/ipset | 1 - config/rootfiles/core/137/filelists/iptables | 1 - config/rootfiles/core/137/filelists/knot | 1 - config/rootfiles/core/137/filelists/libhtp | 1 - .../core/137/filelists/libnetfilter_queue | 1 - config/rootfiles/core/137/filelists/libpcap | 1 - config/rootfiles/core/137/filelists/libssh | 1 - config/rootfiles/core/137/filelists/pcre | 1 - .../rootfiles/core/137/filelists/strongswan | 1 - config/rootfiles/core/137/filelists/suricata | 1 - config/rootfiles/core/137/filelists/tzdata | 1 - config/rootfiles/core/137/filelists/unbound | 1 - .../core/137/filelists/wpa_supplicant | 1 - .../rootfiles/core/137/filelists/x86_64/linux | 1 - .../core/137/filelists/x86_64/linux-initrd | 1 - config/rootfiles/core/{137 => 139}/exclude | 0 config/rootfiles/core/139/filelists/bash | 1 + .../core/139/filelists/ca-certificates | 1 + config/rootfiles/core/139/filelists/ddns | 1 + config/rootfiles/core/139/filelists/files | 16 ++++ .../core/139/filelists/i586/intel-microcode | 1 + .../core/139/filelists/i586/openssl-sse2 | 1 + config/rootfiles/core/139/filelists/logwatch | 1 + config/rootfiles/core/139/filelists/lz4 | 1 + config/rootfiles/core/139/filelists/openssl | 1 + config/rootfiles/core/139/filelists/openvpn | 1 + config/rootfiles/core/139/filelists/readline | 1 + .../core/139/filelists/readline-compat | 1 + config/rootfiles/core/139/filelists/squid | 1 + .../core/139/filelists/x86_64/intel-microcode | 1 + config/rootfiles/core/{137 => 139}/update.sh | 90 +------------------ 46 files changed, 32 insertions(+), 138 deletions(-) delete mode 120000 config/rootfiles/core/137/filelists/IO-Socket-SSL delete mode 120000 config/rootfiles/core/137/filelists/Net_SSLeay delete mode 120000 config/rootfiles/core/137/filelists/aarch64/linux delete mode 120000 config/rootfiles/core/137/filelists/aarch64/linux-initrd delete mode 120000 config/rootfiles/core/137/filelists/armv5tel/linux-initrd-kirkwood delete mode 120000 config/rootfiles/core/137/filelists/armv5tel/linux-initrd-multi delete mode 120000 config/rootfiles/core/137/filelists/armv5tel/linux-kirkwood delete mode 120000 config/rootfiles/core/137/filelists/armv5tel/linux-multi delete mode 120000 config/rootfiles/core/137/filelists/bind delete mode 120000 config/rootfiles/core/137/filelists/collectd delete mode 120000 config/rootfiles/core/137/filelists/dhcpcd delete mode 100644 config/rootfiles/core/137/filelists/files delete mode 120000 config/rootfiles/core/137/filelists/i586/linux delete mode 120000 config/rootfiles/core/137/filelists/i586/linux-initrd delete mode 120000 config/rootfiles/core/137/filelists/iproute2 delete mode 120000 config/rootfiles/core/137/filelists/ipset delete mode 120000 config/rootfiles/core/137/filelists/iptables delete mode 120000 config/rootfiles/core/137/filelists/knot delete mode 120000 config/rootfiles/core/137/filelists/libhtp delete mode 120000 config/rootfiles/core/137/filelists/libnetfilter_queue delete mode 120000 config/rootfiles/core/137/filelists/libpcap delete mode 120000 config/rootfiles/core/137/filelists/libssh delete mode 120000 config/rootfiles/core/137/filelists/pcre delete mode 120000 config/rootfiles/core/137/filelists/strongswan delete mode 120000 config/rootfiles/core/137/filelists/suricata delete mode 120000 config/rootfiles/core/137/filelists/tzdata delete mode 120000 config/rootfiles/core/137/filelists/unbound delete mode 120000 config/rootfiles/core/137/filelists/wpa_supplicant delete mode 120000 config/rootfiles/core/137/filelists/x86_64/linux delete mode 120000 config/rootfiles/core/137/filelists/x86_64/linux-initrd rename config/rootfiles/core/{137 => 139}/exclude (100%) create mode 120000 config/rootfiles/core/139/filelists/bash create mode 120000 config/rootfiles/core/139/filelists/ca-certificates create mode 120000 config/rootfiles/core/139/filelists/ddns create mode 100644 config/rootfiles/core/139/filelists/files create mode 120000 config/rootfiles/core/139/filelists/i586/intel-microcode create mode 120000 config/rootfiles/core/139/filelists/i586/openssl-sse2 create mode 120000 config/rootfiles/core/139/filelists/logwatch create mode 120000 config/rootfiles/core/139/filelists/lz4 create mode 120000 config/rootfiles/core/139/filelists/openssl create mode 120000 config/rootfiles/core/139/filelists/openvpn create mode 120000 config/rootfiles/core/139/filelists/readline create mode 120000 config/rootfiles/core/139/filelists/readline-compat create mode 120000 config/rootfiles/core/139/filelists/squid create mode 120000 config/rootfiles/core/139/filelists/x86_64/intel-microcode rename config/rootfiles/core/{137 => 139}/update.sh (51%) diff --git a/config/rootfiles/core/137/filelists/IO-Socket-SSL b/config/rootfiles/core/137/filelists/IO-Socket-SSL deleted file mode 120000 index d24492371d..0000000000 --- a/config/rootfiles/core/137/filelists/IO-Socket-SSL +++ /dev/null @@ -1 +0,0 @@ -../../../common/IO-Socket-SSL \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/Net_SSLeay b/config/rootfiles/core/137/filelists/Net_SSLeay deleted file mode 120000 index 13fe0560cf..0000000000 --- a/config/rootfiles/core/137/filelists/Net_SSLeay +++ /dev/null @@ -1 +0,0 @@ -../../../common/Net_SSLeay \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/aarch64/linux b/config/rootfiles/core/137/filelists/aarch64/linux deleted file mode 120000 index 3a2532bc7d..0000000000 --- a/config/rootfiles/core/137/filelists/aarch64/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/aarch64/linux-initrd b/config/rootfiles/core/137/filelists/aarch64/linux-initrd deleted file mode 120000 index 8acdb0f318..0000000000 --- a/config/rootfiles/core/137/filelists/aarch64/linux-initrd +++ /dev/null @@ -1 +0,0 @@ -../../../../common/aarch64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/core/137/filelists/armv5tel/linux-initrd-kirkwood deleted file mode 120000 index 39c5591b71..0000000000 --- a/config/rootfiles/core/137/filelists/armv5tel/linux-initrd-kirkwood +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-initrd-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/137/filelists/armv5tel/linux-initrd-multi deleted file mode 120000 index 0b1b4530a8..0000000000 --- a/config/rootfiles/core/137/filelists/armv5tel/linux-initrd-multi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-initrd-multi \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/137/filelists/armv5tel/linux-kirkwood deleted file mode 120000 index 72171071e6..0000000000 --- a/config/rootfiles/core/137/filelists/armv5tel/linux-kirkwood +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/armv5tel/linux-multi b/config/rootfiles/core/137/filelists/armv5tel/linux-multi deleted file mode 120000 index 204eb4c437..0000000000 --- a/config/rootfiles/core/137/filelists/armv5tel/linux-multi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/bind b/config/rootfiles/core/137/filelists/bind deleted file mode 120000 index 48a0ebaefd..0000000000 --- a/config/rootfiles/core/137/filelists/bind +++ /dev/null @@ -1 +0,0 @@ -../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/collectd b/config/rootfiles/core/137/filelists/collectd deleted file mode 120000 index 871b32f14b..0000000000 --- a/config/rootfiles/core/137/filelists/collectd +++ /dev/null @@ -1 +0,0 @@ -../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/dhcpcd b/config/rootfiles/core/137/filelists/dhcpcd deleted file mode 120000 index 1e799dabb4..0000000000 --- a/config/rootfiles/core/137/filelists/dhcpcd +++ /dev/null @@ -1 +0,0 @@ -../../../common/dhcpcd \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/files b/config/rootfiles/core/137/filelists/files deleted file mode 100644 index 3b7c8d23b3..0000000000 --- a/config/rootfiles/core/137/filelists/files +++ /dev/null @@ -1,22 +0,0 @@ -etc/system-release -etc/issue -srv/web/ipfire/cgi-bin/credits.cgi -usr/lib/firewall/rules.pl -usr/sbin/firewall-policy -var/ipfire/langs -etc/logrotate.conf -etc/rc.d/init.d/firewall -etc/rc.d/init.d/unbound -etc/rc.d/init.d/networking/red.up/99-geoip-database -etc/sysctl.conf -srv/web/ipfire/cgi-bin/dns.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/qos.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -usr/lib/firewall/rules.pl -usr/sbin/firewall-policy -usr/local/bin/xt_geoip_update -var/ipfire/backup/bin/backup.pl -var/ipfire/qos/bin/makeqosscripts.pl -var/ipfire/suricata/ruleset-sources -srv/web/ipfire/cgi-bin/ovpnmain.cgi diff --git a/config/rootfiles/core/137/filelists/i586/linux b/config/rootfiles/core/137/filelists/i586/linux deleted file mode 120000 index 693ec4bbf9..0000000000 --- a/config/rootfiles/core/137/filelists/i586/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/i586/linux-initrd b/config/rootfiles/core/137/filelists/i586/linux-initrd deleted file mode 120000 index 32a03e6a90..0000000000 --- a/config/rootfiles/core/137/filelists/i586/linux-initrd +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/iproute2 b/config/rootfiles/core/137/filelists/iproute2 deleted file mode 120000 index 05f0f71fb5..0000000000 --- a/config/rootfiles/core/137/filelists/iproute2 +++ /dev/null @@ -1 +0,0 @@ -../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/ipset b/config/rootfiles/core/137/filelists/ipset deleted file mode 120000 index 2b43691f24..0000000000 --- a/config/rootfiles/core/137/filelists/ipset +++ /dev/null @@ -1 +0,0 @@ -../../../common/ipset \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/iptables b/config/rootfiles/core/137/filelists/iptables deleted file mode 120000 index 8caf12bccb..0000000000 --- a/config/rootfiles/core/137/filelists/iptables +++ /dev/null @@ -1 +0,0 @@ -../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/knot b/config/rootfiles/core/137/filelists/knot deleted file mode 120000 index 28e96f8782..0000000000 --- a/config/rootfiles/core/137/filelists/knot +++ /dev/null @@ -1 +0,0 @@ -../../../common/knot \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/libhtp b/config/rootfiles/core/137/filelists/libhtp deleted file mode 120000 index 676e2c5e87..0000000000 --- a/config/rootfiles/core/137/filelists/libhtp +++ /dev/null @@ -1 +0,0 @@ -../../../common/libhtp \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/libnetfilter_queue b/config/rootfiles/core/137/filelists/libnetfilter_queue deleted file mode 120000 index 9344b04bf3..0000000000 --- a/config/rootfiles/core/137/filelists/libnetfilter_queue +++ /dev/null @@ -1 +0,0 @@ -../../../common/libnetfilter_queue \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/libpcap b/config/rootfiles/core/137/filelists/libpcap deleted file mode 120000 index c7f9f52a80..0000000000 --- a/config/rootfiles/core/137/filelists/libpcap +++ /dev/null @@ -1 +0,0 @@ -../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/libssh b/config/rootfiles/core/137/filelists/libssh deleted file mode 120000 index ecbb67053a..0000000000 --- a/config/rootfiles/core/137/filelists/libssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/libssh \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/pcre b/config/rootfiles/core/137/filelists/pcre deleted file mode 120000 index b390d9a367..0000000000 --- a/config/rootfiles/core/137/filelists/pcre +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/strongswan b/config/rootfiles/core/137/filelists/strongswan deleted file mode 120000 index 90c727e265..0000000000 --- a/config/rootfiles/core/137/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/suricata b/config/rootfiles/core/137/filelists/suricata deleted file mode 120000 index f671f69933..0000000000 --- a/config/rootfiles/core/137/filelists/suricata +++ /dev/null @@ -1 +0,0 @@ -../../../common/suricata \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/tzdata b/config/rootfiles/core/137/filelists/tzdata deleted file mode 120000 index 5a6e3252f3..0000000000 --- a/config/rootfiles/core/137/filelists/tzdata +++ /dev/null @@ -1 +0,0 @@ -../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/unbound b/config/rootfiles/core/137/filelists/unbound deleted file mode 120000 index 66adf09242..0000000000 --- a/config/rootfiles/core/137/filelists/unbound +++ /dev/null @@ -1 +0,0 @@ -../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/wpa_supplicant b/config/rootfiles/core/137/filelists/wpa_supplicant deleted file mode 120000 index 1d04c03c01..0000000000 --- a/config/rootfiles/core/137/filelists/wpa_supplicant +++ /dev/null @@ -1 +0,0 @@ -../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/x86_64/linux b/config/rootfiles/core/137/filelists/x86_64/linux deleted file mode 120000 index 0615b5b9ad..0000000000 --- a/config/rootfiles/core/137/filelists/x86_64/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/x86_64/linux-initrd b/config/rootfiles/core/137/filelists/x86_64/linux-initrd deleted file mode 120000 index 1b9fff70ff..0000000000 --- a/config/rootfiles/core/137/filelists/x86_64/linux-initrd +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/137/exclude b/config/rootfiles/core/139/exclude similarity index 100% rename from config/rootfiles/core/137/exclude rename to config/rootfiles/core/139/exclude diff --git a/config/rootfiles/core/139/filelists/bash b/config/rootfiles/core/139/filelists/bash new file mode 120000 index 0000000000..de970cb1d1 --- /dev/null +++ b/config/rootfiles/core/139/filelists/bash @@ -0,0 +1 @@ +../../../common/bash \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/ca-certificates b/config/rootfiles/core/139/filelists/ca-certificates new file mode 120000 index 0000000000..320fea8f40 --- /dev/null +++ b/config/rootfiles/core/139/filelists/ca-certificates @@ -0,0 +1 @@ +../../../common/ca-certificates \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/ddns b/config/rootfiles/core/139/filelists/ddns new file mode 120000 index 0000000000..739516420f --- /dev/null +++ b/config/rootfiles/core/139/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/files b/config/rootfiles/core/139/filelists/files new file mode 100644 index 0000000000..d22fb83141 --- /dev/null +++ b/config/rootfiles/core/139/filelists/files @@ -0,0 +1,16 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs +etc/httpd/conf/vhosts.d/ipfire-interface.conf +etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf +etc/rc.d/init.d/functions +etc/rc.d/init.d/networking/red.up/23-suricata +etc/rc.d/init.d/unbound +etc/suricata/suricata.yaml +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/mail.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +usr/sbin/convert-snort +usr/lib/firewall/firewall-lib.pl +var/ipfire/ids-functions.pl diff --git a/config/rootfiles/core/139/filelists/i586/intel-microcode b/config/rootfiles/core/139/filelists/i586/intel-microcode new file mode 120000 index 0000000000..f03e84778a --- /dev/null +++ b/config/rootfiles/core/139/filelists/i586/intel-microcode @@ -0,0 +1 @@ +../../../../common/i586/intel-microcode \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/i586/openssl-sse2 b/config/rootfiles/core/139/filelists/i586/openssl-sse2 new file mode 120000 index 0000000000..f424713d6c --- /dev/null +++ b/config/rootfiles/core/139/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/logwatch b/config/rootfiles/core/139/filelists/logwatch new file mode 120000 index 0000000000..f14eabda99 --- /dev/null +++ b/config/rootfiles/core/139/filelists/logwatch @@ -0,0 +1 @@ +../../../common/logwatch \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/lz4 b/config/rootfiles/core/139/filelists/lz4 new file mode 120000 index 0000000000..65c31802e1 --- /dev/null +++ b/config/rootfiles/core/139/filelists/lz4 @@ -0,0 +1 @@ +../../../common/lz4 \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/openssl b/config/rootfiles/core/139/filelists/openssl new file mode 120000 index 0000000000..e011a9266c --- /dev/null +++ b/config/rootfiles/core/139/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/openvpn b/config/rootfiles/core/139/filelists/openvpn new file mode 120000 index 0000000000..493f3f7a42 --- /dev/null +++ b/config/rootfiles/core/139/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/readline b/config/rootfiles/core/139/filelists/readline new file mode 120000 index 0000000000..84209f1891 --- /dev/null +++ b/config/rootfiles/core/139/filelists/readline @@ -0,0 +1 @@ +../../../common/readline \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/readline-compat b/config/rootfiles/core/139/filelists/readline-compat new file mode 120000 index 0000000000..f96bc808cc --- /dev/null +++ b/config/rootfiles/core/139/filelists/readline-compat @@ -0,0 +1 @@ +../../../common/readline-compat \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/squid b/config/rootfiles/core/139/filelists/squid new file mode 120000 index 0000000000..2dc8372a0e --- /dev/null +++ b/config/rootfiles/core/139/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/x86_64/intel-microcode b/config/rootfiles/core/139/filelists/x86_64/intel-microcode new file mode 120000 index 0000000000..d5ac074e2e --- /dev/null +++ b/config/rootfiles/core/139/filelists/x86_64/intel-microcode @@ -0,0 +1 @@ +../../../../common/x86_64/intel-microcode \ No newline at end of file diff --git a/config/rootfiles/core/137/update.sh b/config/rootfiles/core/139/update.sh similarity index 51% rename from config/rootfiles/core/137/update.sh rename to config/rootfiles/core/139/update.sh index f2e83fc77c..fb3105aa03 100644 --- a/config/rootfiles/core/137/update.sh +++ b/config/rootfiles/core/139/update.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 -core=137 +core=139 exit_with_error() { # Set last succesfull installed core. @@ -41,42 +41,6 @@ for (( i=1; i<=$core; i++ )); do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done -KVER="xxxKVERxxx" - -# Backup uEnv.txt if exist -if [ -e /boot/uEnv.txt ]; then - cp -vf /boot/uEnv.txt /boot/uEnv.txt.org -fi - -# Do some sanity checks. -case $(uname -r) in - *-ipfire*) - # Ok. - ;; - *) - exit_with_error "ERROR cannot update. No IPFire Kernel." 1 - ;; -esac - -# Check diskspace on root -ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $ROOTSPACE -lt 80000 ]; then - exit_with_error "ERROR cannot update because not enough free space on root." 2 - exit 2 -fi - -# Remove the old kernel -rm -rf /boot/System.map-* -rm -rf /boot/config-* -rm -rf /boot/ipfirerd-* -rm -rf /boot/initramfs-* -rm -rf /boot/vmlinuz-* -rm -rf /boot/uImage-*-ipfire-* -rm -rf /boot/zImage-*-ipfire-* -rm -rf /boot/uInit-*-ipfire-* -rm -rf /boot/dtb-*-ipfire-* -rm -rf /lib/modules # Remove files @@ -92,57 +56,9 @@ ldconfig /usr/local/bin/update-lang-cache # Start services -/usr/local/bin/ipsecctrl S -/etc/init.d/suricata restart -/etc/init.d/unbound restart -/etc/init.d/collectd restart - -# remove lm_sensor config after collectd was started -# to reserch sensors at next boot with updated kernel -rm -f /etc/sysconfig/lm_sensors - -# generate new qos script -/usr/local/bin/qosctrl generate - -# Search sensors again after reboot into the new kernel -rm -f /etc/sysconfig/lm_sensors - -# Upadate Kernel version uEnv.txt -if [ -e /boot/uEnv.txt ]; then - sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt -fi - -# call user update script (needed for some arm boards) -if [ -e /boot/pakfire-kernel-update ]; then - /boot/pakfire-kernel-update ${KVER} -fi -case "$(uname -m)" in - i?86) - # Force (re)install pae kernel if pae is supported - rm -rf /opt/pakfire/db/installed/meta-linux-pae - rm -rf /opt/pakfire/db/rootfiles/linux-pae - if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then - ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - if [ $BOOTSPACE -lt 22000 -o $ROOTSPACE -lt 120000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: WARNING not enough space for pae kernel." - touch /var/run/need_reboot - else - echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae - fi - else - touch /var/run/need_reboot - fi - ;; - *) - # This update needs a reboot... - touch /var/run/need_reboot - ;; -esac +# This update needs a reboot... +#touch /var/run/need_reboot # Finish /etc/init.d/fireinfo start -- 2.39.2