mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 11:43:25 +02:00
Merge branch 'aarch64' into next
Conflicts: config/rootfiles/core/121/filelists/acpid config/rootfiles/core/121/filelists/apache2 config/rootfiles/core/121/filelists/apr config/rootfiles/core/121/filelists/aprutil config/rootfiles/core/121/filelists/armv5tel/files config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood config/rootfiles/core/121/filelists/armv5tel/linux-multi config/rootfiles/core/121/filelists/armv5tel/rpi-firmware config/rootfiles/core/121/filelists/armv5tel/u-boot config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage config/rootfiles/core/121/filelists/beep config/rootfiles/core/121/filelists/cmake config/rootfiles/core/121/filelists/crda config/rootfiles/core/121/filelists/dhcp config/rootfiles/core/121/filelists/flex config/rootfiles/core/121/filelists/i586/grub config/rootfiles/core/121/filelists/i586/intel-microcode config/rootfiles/core/121/filelists/i586/linux config/rootfiles/core/121/filelists/i586/linux-initrd config/rootfiles/core/121/filelists/iw config/rootfiles/core/121/filelists/jwhois config/rootfiles/core/121/filelists/libidn config/rootfiles/core/121/filelists/multipath-tools config/rootfiles/core/121/filelists/pcre config/rootfiles/core/121/filelists/tar config/rootfiles/core/121/filelists/unbound config/rootfiles/core/121/filelists/wget config/rootfiles/core/121/filelists/x86_64/grub config/rootfiles/core/121/filelists/x86_64/intel-microcode config/rootfiles/core/121/filelists/x86_64/linux config/rootfiles/core/121/filelists/x86_64/linux-initrd config/rootfiles/core/122/filelists/aarch64/files config/rootfiles/core/122/filelists/acpid config/rootfiles/core/122/filelists/apache2 config/rootfiles/core/122/filelists/apr config/rootfiles/core/122/filelists/aprutil config/rootfiles/core/122/filelists/armv5tel/linux-initrd-kirkwood config/rootfiles/core/122/filelists/armv5tel/linux-initrd-multi config/rootfiles/core/122/filelists/armv5tel/linux-kirkwood config/rootfiles/core/122/filelists/armv5tel/linux-multi config/rootfiles/core/122/filelists/armv5tel/rpi-firmware config/rootfiles/core/122/filelists/armv5tel/u-boot config/rootfiles/core/122/filelists/armv5tel/u-boot-kirkwood config/rootfiles/core/122/filelists/armv5tel/u-boot-mkimage config/rootfiles/core/122/filelists/beep config/rootfiles/core/122/filelists/cmake config/rootfiles/core/122/filelists/crda config/rootfiles/core/122/filelists/dhcp config/rootfiles/core/122/filelists/flex config/rootfiles/core/122/filelists/i586/grub config/rootfiles/core/122/filelists/i586/intel-microcode config/rootfiles/core/122/filelists/i586/linux config/rootfiles/core/122/filelists/i586/linux-initrd config/rootfiles/core/122/filelists/iw config/rootfiles/core/122/filelists/jwhois config/rootfiles/core/122/filelists/libidn config/rootfiles/core/122/filelists/multipath-tools config/rootfiles/core/122/filelists/pcre config/rootfiles/core/122/filelists/tar config/rootfiles/core/122/filelists/unbound config/rootfiles/core/122/filelists/wget config/rootfiles/core/122/filelists/x86_64/grub config/rootfiles/core/122/filelists/x86_64/intel-microcode config/rootfiles/core/122/filelists/x86_64/linux config/rootfiles/core/122/filelists/x86_64/linux-initrd config/rootfiles/core/123/filelists/unbound config/rootfiles/oldcore/121/filelists/acpid config/rootfiles/oldcore/121/filelists/apache2 config/rootfiles/oldcore/121/filelists/apr config/rootfiles/oldcore/121/filelists/aprutil config/rootfiles/oldcore/121/filelists/armv5tel/files config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-kirkwood config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-multi config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-rpi config/rootfiles/oldcore/121/filelists/armv5tel/linux-kirkwood config/rootfiles/oldcore/121/filelists/armv5tel/linux-multi config/rootfiles/oldcore/121/filelists/armv5tel/linux-rpi config/rootfiles/oldcore/121/filelists/armv5tel/rpi-firmware config/rootfiles/oldcore/121/filelists/armv5tel/u-boot config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-kirkwood config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-mkimage config/rootfiles/oldcore/121/filelists/beep config/rootfiles/oldcore/121/filelists/cmake config/rootfiles/oldcore/121/filelists/crda config/rootfiles/oldcore/121/filelists/dhcp config/rootfiles/oldcore/121/filelists/flex config/rootfiles/oldcore/121/filelists/i586/grub config/rootfiles/oldcore/121/filelists/i586/intel-microcode config/rootfiles/oldcore/121/filelists/i586/linux config/rootfiles/oldcore/121/filelists/i586/linux-initrd config/rootfiles/oldcore/121/filelists/iw config/rootfiles/oldcore/121/filelists/jwhois config/rootfiles/oldcore/121/filelists/libidn config/rootfiles/oldcore/121/filelists/multipath-tools config/rootfiles/oldcore/121/filelists/pcre config/rootfiles/oldcore/121/filelists/tar config/rootfiles/oldcore/121/filelists/wget config/rootfiles/oldcore/121/filelists/x86_64/grub config/rootfiles/oldcore/121/filelists/x86_64/intel-microcode config/rootfiles/oldcore/121/filelists/x86_64/linux config/rootfiles/oldcore/121/filelists/x86_64/linux-initrd make.sh
This commit is contained in:
@@ -119,6 +119,7 @@ etc/rc.d/rc0.d/S80mountfs
|
||||
etc/rc.d/rc0.d/S90swap
|
||||
etc/rc.d/rc0.d/S99halt
|
||||
#etc/rc.d/rc3.d
|
||||
etc/rc.d/rc3.d/S00random
|
||||
etc/rc.d/rc3.d/S01vnstat
|
||||
etc/rc.d/rc3.d/S10sysklogd
|
||||
etc/rc.d/rc3.d/S11unbound
|
||||
@@ -132,7 +133,6 @@ etc/rc.d/rc3.d/S19wlanclient
|
||||
etc/rc.d/rc3.d/S20network
|
||||
etc/rc.d/rc3.d/S21leds
|
||||
etc/rc.d/rc3.d/S24cyrus-sasl
|
||||
etc/rc.d/rc3.d/S25random
|
||||
etc/rc.d/rc3.d/S30sshd
|
||||
etc/rc.d/rc3.d/S32apache
|
||||
etc/rc.d/rc3.d/S40fcron
|
||||
|
||||
2
config/rootfiles/common/aarch64/linux-initrd-multi
Normal file
2
config/rootfiles/common/aarch64/linux-initrd-multi
Normal file
@@ -0,0 +1,2 @@
|
||||
#boot/uInit-KVER-ipfire-multi
|
||||
boot/initramfs-KVER-ipfire-multi.img
|
||||
2692
config/rootfiles/common/aarch64/linux-multi
Normal file
2692
config/rootfiles/common/aarch64/linux-multi
Normal file
File diff suppressed because it is too large
Load Diff
18
config/rootfiles/common/aarch64/rpi-firmware
Normal file
18
config/rootfiles/common/aarch64/rpi-firmware
Normal file
@@ -0,0 +1,18 @@
|
||||
#boot/LICENCE.broadcom
|
||||
boot/bootcode.bin
|
||||
boot/cmdline.txt
|
||||
boot/config.txt
|
||||
boot/fixup.dat
|
||||
boot/fixup_cd.dat
|
||||
boot/fixup_db.dat
|
||||
boot/fixup_x.dat
|
||||
boot/start.elf
|
||||
boot/start_cd.elf
|
||||
boot/start_db.elf
|
||||
boot/start_x.elf
|
||||
lib/firmware/brcm/brcmfmac43430-sdio.bin
|
||||
lib/firmware/brcm/brcmfmac43430-sdio.txt
|
||||
lib/firmware/brcm/brcmfmac43430a0-sdio.bin
|
||||
lib/firmware/brcm/brcmfmac43455-sdio.bin
|
||||
lib/firmware/brcm/brcmfmac43455-sdio.clm_blob
|
||||
lib/firmware/brcm/brcmfmac43455-sdio.txt
|
||||
9
config/rootfiles/common/aarch64/u-boot
Normal file
9
config/rootfiles/common/aarch64/u-boot
Normal file
@@ -0,0 +1,9 @@
|
||||
boot/boot.cmd
|
||||
boot/boot.mk
|
||||
boot/boot.scr
|
||||
boot/kernel8.img
|
||||
boot/uEnv.txt
|
||||
boot/uboot.env
|
||||
#usr/share/u-boot
|
||||
#usr/share/u-boot/rpi3
|
||||
usr/share/u-boot/rpi3/kernel8.img
|
||||
1
config/rootfiles/common/aarch64/u-boot-mkimage
Normal file
1
config/rootfiles/common/aarch64/u-boot-mkimage
Normal file
@@ -0,0 +1 @@
|
||||
usr/bin/mkimage
|
||||
@@ -119,6 +119,7 @@ etc/rc.d/rc0.d/S80mountfs
|
||||
etc/rc.d/rc0.d/S90swap
|
||||
etc/rc.d/rc0.d/S99halt
|
||||
#etc/rc.d/rc3.d
|
||||
etc/rc.d/rc3.d/S00random
|
||||
etc/rc.d/rc3.d/S01vnstat
|
||||
etc/rc.d/rc3.d/S10sysklogd
|
||||
etc/rc.d/rc3.d/S11unbound
|
||||
@@ -132,7 +133,6 @@ etc/rc.d/rc3.d/S19wlanclient
|
||||
etc/rc.d/rc3.d/S20network
|
||||
etc/rc.d/rc3.d/S21leds
|
||||
etc/rc.d/rc3.d/S24cyrus-sasl
|
||||
etc/rc.d/rc3.d/S25random
|
||||
etc/rc.d/rc3.d/S30sshd
|
||||
etc/rc.d/rc3.d/S32apache
|
||||
etc/rc.d/rc3.d/S40fcron
|
||||
|
||||
@@ -118,6 +118,7 @@ etc/rc.d/rc0.d/S80mountfs
|
||||
etc/rc.d/rc0.d/S90swap
|
||||
etc/rc.d/rc0.d/S99halt
|
||||
#etc/rc.d/rc3.d
|
||||
etc/rc.d/rc3.d/S00random
|
||||
etc/rc.d/rc3.d/S01vnstat
|
||||
etc/rc.d/rc3.d/S10sysklogd
|
||||
etc/rc.d/rc3.d/S12acpid
|
||||
@@ -131,7 +132,6 @@ etc/rc.d/rc3.d/S20network
|
||||
etc/rc.d/rc3.d/S11unbound
|
||||
etc/rc.d/rc3.d/S21leds
|
||||
etc/rc.d/rc3.d/S24cyrus-sasl
|
||||
etc/rc.d/rc3.d/S25random
|
||||
etc/rc.d/rc3.d/S30sshd
|
||||
etc/rc.d/rc3.d/S32apache
|
||||
etc/rc.d/rc3.d/S40fcron
|
||||
|
||||
@@ -118,6 +118,7 @@ etc/rc.d/rc0.d/S80mountfs
|
||||
etc/rc.d/rc0.d/S90swap
|
||||
etc/rc.d/rc0.d/S99halt
|
||||
#etc/rc.d/rc3.d
|
||||
etc/rc.d/rc3.d/S00random
|
||||
etc/rc.d/rc3.d/S01vnstat
|
||||
etc/rc.d/rc3.d/S10sysklogd
|
||||
etc/rc.d/rc3.d/S12acpid
|
||||
@@ -131,7 +132,6 @@ etc/rc.d/rc3.d/S20network
|
||||
etc/rc.d/rc3.d/S11unbound
|
||||
etc/rc.d/rc3.d/S21leds
|
||||
etc/rc.d/rc3.d/S24cyrus-sasl
|
||||
etc/rc.d/rc3.d/S25random
|
||||
etc/rc.d/rc3.d/S30sshd
|
||||
etc/rc.d/rc3.d/S32apache
|
||||
etc/rc.d/rc3.d/S40fcron
|
||||
|
||||
@@ -36,6 +36,9 @@ done
|
||||
# Extract files
|
||||
extract_files
|
||||
|
||||
# move exec random initskript earlier
|
||||
mv /etc/rc.d/rc3.d/S??random /etc/rc.d/rc3.d/S00random
|
||||
|
||||
# update linker config
|
||||
ldconfig
|
||||
|
||||
@@ -61,3 +64,4 @@ sync
|
||||
|
||||
# Don't report the exitcode last command
|
||||
exit 0
|
||||
|
||||
|
||||
@@ -1,20 +1,6 @@
|
||||
etc/system-release
|
||||
etc/issue
|
||||
etc/rc.d/init.d/acpid
|
||||
etc/rc.d/init.d/collectd
|
||||
etc/rc.d/init.d/firstsetup
|
||||
etc/rc.d/init.d/leds
|
||||
etc/rc.d/init.d/partresize
|
||||
etc/rc.d/init.d/rngd
|
||||
etc/rc.d/rc0.d/K87acpid
|
||||
etc/rc.d/rc3.d/S12acpid
|
||||
etc/rc.d/rc6.d/K87acpid
|
||||
etc/ssl/certs/ca-bundle.crt
|
||||
srv/web/ipfire/cgi-bin/entropy.cgi
|
||||
srv/web/ipfire/cgi-bin/firewall.cgi
|
||||
srv/web/ipfire/cgi-bin/fwhosts.cgi
|
||||
srv/web/ipfire/cgi-bin/ovpnmain.cgi
|
||||
srv/web/ipfire/cgi-bin/remote.cgi
|
||||
usr/lib/firewall/firewall-lib.pl
|
||||
var/ipfire/langs
|
||||
var/ipfire/qos/bin/makeqosscripts.pl
|
||||
opt/pakfire/etc/pakfire.conf
|
||||
usr/sbin/setup
|
||||
|
||||
@@ -29,6 +29,8 @@ core=121
|
||||
exit_with_error() {
|
||||
# Set last succesfull installed core.
|
||||
echo $(($core-1)) > /opt/pakfire/db/core/mine
|
||||
# don't start pakfire again at error
|
||||
killall -KILL pak_update
|
||||
/usr/bin/logger -p syslog.emerg -t ipfire \
|
||||
"core-update-${core}: $1"
|
||||
exit $2
|
||||
@@ -39,13 +41,6 @@ for (( i=1; i<=$core; i++ )); do
|
||||
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
|
||||
done
|
||||
|
||||
# This update cannot be applied on ARM
|
||||
case "$(uname -a)" in
|
||||
arm*)
|
||||
exit_with_error "ERROR: Cannot update on ARM. Please re-install." 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# Do some sanity checks.
|
||||
case $(uname -r) in
|
||||
*-ipfire*)
|
||||
@@ -59,23 +54,11 @@ esac
|
||||
# Check diskspace on root
|
||||
ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
|
||||
|
||||
if [ $ROOTSPACE -lt 100000 ]; then
|
||||
if [ $ROOTSPACE -lt 220000 ]; 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
|
||||
|
||||
# Stop services
|
||||
|
||||
# Extract files
|
||||
@@ -85,27 +68,12 @@ extract_files
|
||||
ldconfig
|
||||
|
||||
# Update Language cache
|
||||
/usr/local/bin/update-lang-cache
|
||||
|
||||
# Remove Nagios files, if any...
|
||||
rm -rvf \
|
||||
/etc/rc.d/init.d/nagios \
|
||||
/usr/bin/nagios \
|
||||
/etc/rc.d/rc6.d/K33nagios \
|
||||
/etc/rc.d/rc3.d/off/S67nagios \
|
||||
/etc/rc.d/rc0.d/K33nagios \
|
||||
/etc/httpd/conf/conf.d/nagios.conf \
|
||||
/etc/nagios/nagios.cfg \
|
||||
/usr/bin/p1.pl \
|
||||
/usr/bin/nagiostats \
|
||||
/usr/share/nagios/ \
|
||||
/var/nagios/
|
||||
|
||||
# Start services
|
||||
/etc/init.d/apache restart
|
||||
|
||||
# This update needs a reboot...
|
||||
touch /var/run/need_reboot
|
||||
#touch /var/run/need_reboot
|
||||
|
||||
# Finish
|
||||
/etc/init.d/fireinfo start
|
||||
@@ -116,7 +84,32 @@ if [ -e /boot/grub/grub.cfg ]; then
|
||||
grub-mkconfig -o /boot/grub/grub.cfg
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
# After pakfire has ended run it again and update the lists and do upgrade
|
||||
#
|
||||
echo '#!/bin/bash' > /tmp/pak_update
|
||||
echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update
|
||||
echo ' sleep 1' >> /tmp/pak_update
|
||||
echo 'done' >> /tmp/pak_update
|
||||
echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update
|
||||
echo ' sleep 1' >> /tmp/pak_update
|
||||
echo 'done' >> /tmp/pak_update
|
||||
echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update
|
||||
echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
|
||||
echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
|
||||
echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
|
||||
echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update
|
||||
echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update
|
||||
echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update
|
||||
echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
|
||||
#
|
||||
killall -KILL pak_update
|
||||
chmod +x /tmp/pak_update
|
||||
/tmp/pak_update &
|
||||
|
||||
sync
|
||||
|
||||
# Don't report the exitcode last command
|
||||
exit 0
|
||||
|
||||
|
||||
30
config/rootfiles/oldcore/122/exclude
Normal file
30
config/rootfiles/oldcore/122/exclude
Normal file
@@ -0,0 +1,30 @@
|
||||
boot/config.txt
|
||||
boot/grub/grub.cfg
|
||||
boot/grub/grubenv
|
||||
etc/alternatives
|
||||
etc/collectd.custom
|
||||
etc/default/grub
|
||||
etc/ipsec.conf
|
||||
etc/ipsec.secrets
|
||||
etc/ipsec.user.conf
|
||||
etc/ipsec.user.secrets
|
||||
etc/localtime
|
||||
etc/shadow
|
||||
etc/snort/snort.conf
|
||||
etc/ssh/ssh_config
|
||||
etc/ssh/sshd_config
|
||||
etc/ssl/openssl.cnf
|
||||
etc/sudoers
|
||||
etc/sysconfig/firewall.local
|
||||
etc/sysconfig/rc.local
|
||||
etc/udev/rules.d/30-persistent-network.rules
|
||||
srv/web/ipfire/html/proxy.pac
|
||||
var/ipfire/dma
|
||||
var/ipfire/time
|
||||
var/ipfire/ovpn
|
||||
var/lib/alternatives
|
||||
var/log/cache
|
||||
var/log/dhcpcd.log
|
||||
var/log/messages
|
||||
var/state/dhcp/dhcpd.leases
|
||||
var/updatecache
|
||||
1
config/rootfiles/oldcore/122/filelists/acpid
Symbolic link
1
config/rootfiles/oldcore/122/filelists/acpid
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/acpid
|
||||
1
config/rootfiles/oldcore/122/filelists/apache2
Symbolic link
1
config/rootfiles/oldcore/122/filelists/apache2
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/apache2
|
||||
1
config/rootfiles/oldcore/122/filelists/apr
Symbolic link
1
config/rootfiles/oldcore/122/filelists/apr
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/apr
|
||||
1
config/rootfiles/oldcore/122/filelists/aprutil
Symbolic link
1
config/rootfiles/oldcore/122/filelists/aprutil
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/aprutil
|
||||
1
config/rootfiles/oldcore/122/filelists/armv5tel/files
Normal file
1
config/rootfiles/oldcore/122/filelists/armv5tel/files
Normal file
@@ -0,0 +1 @@
|
||||
etc/rc.d/init.d/swconfig
|
||||
@@ -0,0 +1 @@
|
||||
../../../../common/armv5tel/linux-initrd-kirkwood
|
||||
@@ -0,0 +1 @@
|
||||
../../../../common/armv5tel/linux-initrd-multi
|
||||
1
config/rootfiles/oldcore/122/filelists/armv5tel/linux-kirkwood
Symbolic link
1
config/rootfiles/oldcore/122/filelists/armv5tel/linux-kirkwood
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/armv5tel/linux-kirkwood
|
||||
1
config/rootfiles/oldcore/122/filelists/armv5tel/linux-multi
Symbolic link
1
config/rootfiles/oldcore/122/filelists/armv5tel/linux-multi
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/armv5tel/linux-multi
|
||||
1
config/rootfiles/oldcore/122/filelists/armv5tel/rpi-firmware
Symbolic link
1
config/rootfiles/oldcore/122/filelists/armv5tel/rpi-firmware
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/armv5tel/rpi-firmware
|
||||
1
config/rootfiles/oldcore/122/filelists/armv5tel/u-boot
Symbolic link
1
config/rootfiles/oldcore/122/filelists/armv5tel/u-boot
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/armv5tel/u-boot
|
||||
1
config/rootfiles/oldcore/122/filelists/armv5tel/u-boot-kirkwood
Symbolic link
1
config/rootfiles/oldcore/122/filelists/armv5tel/u-boot-kirkwood
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/armv5tel/u-boot-kirkwood
|
||||
1
config/rootfiles/oldcore/122/filelists/armv5tel/u-boot-mkimage
Symbolic link
1
config/rootfiles/oldcore/122/filelists/armv5tel/u-boot-mkimage
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/armv5tel/u-boot-mkimage
|
||||
1
config/rootfiles/oldcore/122/filelists/beep
Symbolic link
1
config/rootfiles/oldcore/122/filelists/beep
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/beep
|
||||
1
config/rootfiles/oldcore/122/filelists/cmake
Symbolic link
1
config/rootfiles/oldcore/122/filelists/cmake
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/cmake
|
||||
1
config/rootfiles/oldcore/122/filelists/crda
Symbolic link
1
config/rootfiles/oldcore/122/filelists/crda
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/crda
|
||||
1
config/rootfiles/oldcore/122/filelists/dhcp
Symbolic link
1
config/rootfiles/oldcore/122/filelists/dhcp
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/dhcp
|
||||
19
config/rootfiles/oldcore/122/filelists/files
Normal file
19
config/rootfiles/oldcore/122/filelists/files
Normal file
@@ -0,0 +1,19 @@
|
||||
etc/system-release
|
||||
etc/issue
|
||||
etc/rc.d/init.d/acpid
|
||||
etc/rc.d/init.d/collectd
|
||||
etc/rc.d/init.d/firstsetup
|
||||
etc/rc.d/init.d/leds
|
||||
etc/rc.d/init.d/partresize
|
||||
etc/rc.d/init.d/random
|
||||
etc/rc.d/rc0.d/K87acpid
|
||||
etc/rc.d/rc3.d/S12acpid
|
||||
etc/rc.d/rc6.d/K87acpid
|
||||
srv/web/ipfire/cgi-bin/entropy.cgi
|
||||
srv/web/ipfire/cgi-bin/firewall.cgi
|
||||
srv/web/ipfire/cgi-bin/fwhosts.cgi
|
||||
srv/web/ipfire/cgi-bin/ovpnmain.cgi
|
||||
srv/web/ipfire/cgi-bin/remote.cgi
|
||||
usr/lib/firewall/firewall-lib.pl
|
||||
var/ipfire/langs
|
||||
var/ipfire/qos/bin/makeqosscripts.pl
|
||||
1
config/rootfiles/oldcore/122/filelists/flex
Symbolic link
1
config/rootfiles/oldcore/122/filelists/flex
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/flex
|
||||
1
config/rootfiles/oldcore/122/filelists/i586/grub
Symbolic link
1
config/rootfiles/oldcore/122/filelists/i586/grub
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/i586/grub
|
||||
1
config/rootfiles/oldcore/122/filelists/i586/intel-microcode
Symbolic link
1
config/rootfiles/oldcore/122/filelists/i586/intel-microcode
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/i586/intel-microcode
|
||||
1
config/rootfiles/oldcore/122/filelists/i586/linux
Symbolic link
1
config/rootfiles/oldcore/122/filelists/i586/linux
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/i586/linux
|
||||
1
config/rootfiles/oldcore/122/filelists/i586/linux-initrd
Symbolic link
1
config/rootfiles/oldcore/122/filelists/i586/linux-initrd
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/i586/linux-initrd
|
||||
1
config/rootfiles/oldcore/122/filelists/iw
Symbolic link
1
config/rootfiles/oldcore/122/filelists/iw
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/iw
|
||||
1
config/rootfiles/oldcore/122/filelists/jwhois
Symbolic link
1
config/rootfiles/oldcore/122/filelists/jwhois
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/jwhois
|
||||
1
config/rootfiles/oldcore/122/filelists/libidn
Symbolic link
1
config/rootfiles/oldcore/122/filelists/libidn
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/libidn
|
||||
1
config/rootfiles/oldcore/122/filelists/multipath-tools
Symbolic link
1
config/rootfiles/oldcore/122/filelists/multipath-tools
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/multipath-tools
|
||||
1
config/rootfiles/oldcore/122/filelists/pcre
Symbolic link
1
config/rootfiles/oldcore/122/filelists/pcre
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/pcre
|
||||
1
config/rootfiles/oldcore/122/filelists/tar
Symbolic link
1
config/rootfiles/oldcore/122/filelists/tar
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/tar
|
||||
1
config/rootfiles/oldcore/122/filelists/unbound
Symbolic link
1
config/rootfiles/oldcore/122/filelists/unbound
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/unbound
|
||||
1
config/rootfiles/oldcore/122/filelists/wget
Symbolic link
1
config/rootfiles/oldcore/122/filelists/wget
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/wget
|
||||
1
config/rootfiles/oldcore/122/filelists/x86_64/grub
Symbolic link
1
config/rootfiles/oldcore/122/filelists/x86_64/grub
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/x86_64/grub
|
||||
1
config/rootfiles/oldcore/122/filelists/x86_64/intel-microcode
Symbolic link
1
config/rootfiles/oldcore/122/filelists/x86_64/intel-microcode
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/x86_64/intel-microcode
|
||||
1
config/rootfiles/oldcore/122/filelists/x86_64/linux
Symbolic link
1
config/rootfiles/oldcore/122/filelists/x86_64/linux
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/x86_64/linux
|
||||
1
config/rootfiles/oldcore/122/filelists/x86_64/linux-initrd
Symbolic link
1
config/rootfiles/oldcore/122/filelists/x86_64/linux-initrd
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/x86_64/linux-initrd
|
||||
1
config/rootfiles/oldcore/122/filelists/xtables-addons
Symbolic link
1
config/rootfiles/oldcore/122/filelists/xtables-addons
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/xtables-addons
|
||||
1
config/rootfiles/oldcore/122/meta
Normal file
1
config/rootfiles/oldcore/122/meta
Normal file
@@ -0,0 +1 @@
|
||||
DEPS=""
|
||||
162
config/rootfiles/oldcore/122/update.sh
Normal file
162
config/rootfiles/oldcore/122/update.sh
Normal file
@@ -0,0 +1,162 @@
|
||||
#!/bin/bash
|
||||
############################################################################
|
||||
# #
|
||||
# This file is part of the IPFire Firewall. #
|
||||
# #
|
||||
# IPFire is free software; you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
# the Free Software Foundation; either version 3 of the License, or #
|
||||
# (at your option) any later version. #
|
||||
# #
|
||||
# IPFire is distributed in the hope that it will be useful, #
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
|
||||
# GNU General Public License for more details. #
|
||||
# #
|
||||
# You should have received a copy of the GNU General Public License #
|
||||
# along with IPFire; if not, write to the Free Software #
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||
# #
|
||||
# Copyright (C) 2018 IPFire-Team <info@ipfire.org>. #
|
||||
# #
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
|
||||
core=122
|
||||
|
||||
exit_with_error() {
|
||||
# Set last succesfull installed core.
|
||||
echo $(($core-1)) > /opt/pakfire/db/core/mine
|
||||
# don't start pakfire again at error
|
||||
killall -KILL pak_update
|
||||
/usr/bin/logger -p syslog.emerg -t ipfire \
|
||||
"core-update-${core}: $1"
|
||||
exit $2
|
||||
}
|
||||
|
||||
# Remove old core updates from pakfire cache to save space...
|
||||
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
|
||||
rm -f /etc/sysconfig/lm_sensors
|
||||
|
||||
# Stop services
|
||||
|
||||
# Extract files
|
||||
extract_files
|
||||
|
||||
# update linker config
|
||||
ldconfig
|
||||
|
||||
# Update Language cache
|
||||
/usr/local/bin/update-lang-cache
|
||||
|
||||
# Remove Nagios files, if any...
|
||||
rm -rvf \
|
||||
/etc/rc.d/init.d/nagios \
|
||||
/usr/bin/nagios \
|
||||
/etc/rc.d/rc6.d/K33nagios \
|
||||
/etc/rc.d/rc3.d/off/S67nagios \
|
||||
/etc/rc.d/rc0.d/K33nagios \
|
||||
/etc/httpd/conf/conf.d/nagios.conf \
|
||||
/etc/nagios/nagios.cfg \
|
||||
/usr/bin/p1.pl \
|
||||
/usr/bin/nagiostats \
|
||||
/usr/share/nagios/ \
|
||||
/var/nagios/
|
||||
|
||||
# Start services
|
||||
/etc/init.d/apache restart
|
||||
|
||||
# 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
|
||||
|
||||
mv /etc/rc.d/rc3.d/S??random /etc/rc.d/rc3.d/S00random
|
||||
|
||||
case "$(uname -m)" in
|
||||
i?86)
|
||||
# Force (re)install pae kernel if pae is supported
|
||||
rm -rf /opt/pakfire/db/installed/meta-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."
|
||||
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
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
# This update needs a reboot...
|
||||
#touch /var/run/need_reboot
|
||||
|
||||
# Finish
|
||||
/etc/init.d/fireinfo start
|
||||
sendprofile
|
||||
|
||||
# Install new grub and update config
|
||||
if [ -e /boot/grub/grub.cfg ]; then
|
||||
/usr/local/bin/update-bootloader
|
||||
fi
|
||||
|
||||
sync
|
||||
|
||||
# Reload microcode
|
||||
modprobe microcode
|
||||
if [ -w "/sys/devices/system/cpu/microcode/reload" ]; then
|
||||
echo 1 > /sys/devices/system/cpu/microcode/reload
|
||||
fi
|
||||
|
||||
# Don't report the exitcode last command
|
||||
exit 0
|
||||
Reference in New Issue
Block a user