mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-14 04:52:59 +02:00
rename core138 -> core139 to insert a emergency core update
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
@@ -1 +0,0 @@
|
||||
../../../common/IO-Socket-SSL
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Net_SSLeay
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/aarch64/linux
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/aarch64/linux-initrd
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/armv5tel/linux-initrd-kirkwood
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/armv5tel/linux-initrd-multi
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/armv5tel/linux-kirkwood
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/armv5tel/linux-multi
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/bind
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/collectd
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/dhcpcd
|
||||
@@ -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
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/i586/linux
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/i586/linux-initrd
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/iproute2
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/ipset
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/iptables
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/knot
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/libhtp
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/libnetfilter_queue
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/libpcap
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/libssh
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/pcre
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/strongswan
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/suricata
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/tzdata
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/unbound
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/wpa_supplicant
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/x86_64/linux
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/x86_64/linux-initrd
|
||||
1
config/rootfiles/core/139/filelists/bash
Symbolic link
1
config/rootfiles/core/139/filelists/bash
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/bash
|
||||
1
config/rootfiles/core/139/filelists/ca-certificates
Symbolic link
1
config/rootfiles/core/139/filelists/ca-certificates
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/ca-certificates
|
||||
1
config/rootfiles/core/139/filelists/ddns
Symbolic link
1
config/rootfiles/core/139/filelists/ddns
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/ddns
|
||||
16
config/rootfiles/core/139/filelists/files
Normal file
16
config/rootfiles/core/139/filelists/files
Normal file
@@ -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
|
||||
1
config/rootfiles/core/139/filelists/i586/intel-microcode
Symbolic link
1
config/rootfiles/core/139/filelists/i586/intel-microcode
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/i586/intel-microcode
|
||||
1
config/rootfiles/core/139/filelists/i586/openssl-sse2
Symbolic link
1
config/rootfiles/core/139/filelists/i586/openssl-sse2
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/i586/openssl-sse2
|
||||
1
config/rootfiles/core/139/filelists/logwatch
Symbolic link
1
config/rootfiles/core/139/filelists/logwatch
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/logwatch
|
||||
1
config/rootfiles/core/139/filelists/lz4
Symbolic link
1
config/rootfiles/core/139/filelists/lz4
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/lz4
|
||||
1
config/rootfiles/core/139/filelists/openssl
Symbolic link
1
config/rootfiles/core/139/filelists/openssl
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/openssl
|
||||
1
config/rootfiles/core/139/filelists/openvpn
Symbolic link
1
config/rootfiles/core/139/filelists/openvpn
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/openvpn
|
||||
1
config/rootfiles/core/139/filelists/readline
Symbolic link
1
config/rootfiles/core/139/filelists/readline
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/readline
|
||||
1
config/rootfiles/core/139/filelists/readline-compat
Symbolic link
1
config/rootfiles/core/139/filelists/readline-compat
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/readline-compat
|
||||
1
config/rootfiles/core/139/filelists/squid
Symbolic link
1
config/rootfiles/core/139/filelists/squid
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/squid
|
||||
1
config/rootfiles/core/139/filelists/x86_64/intel-microcode
Symbolic link
1
config/rootfiles/core/139/filelists/x86_64/intel-microcode
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/x86_64/intel-microcode
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user