mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-27 19:23:24 +02:00
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
This commit is contained in:
Stefan Schantl
@@ -1 +0,0 @@
|
||||
../../../../common/aarch64/efibootmgr
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/aarch64/efivar
|
||||
@@ -1,2 +0,0 @@
|
||||
boot/boot.cmd
|
||||
boot/boot.scr
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/aarch64/grub
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/aarch64/linux
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/aarch64/linux-initrd
|
||||
@@ -1,2 +0,0 @@
|
||||
boot/boot.cmd
|
||||
boot/boot.scr
|
||||
@@ -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/ca-certificates
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/cdrkit
|
||||
@@ -1,31 +0,0 @@
|
||||
etc/system-release
|
||||
etc/issue
|
||||
etc/nsswitch.conf
|
||||
etc/rc.d/helper/aws-setup
|
||||
etc/rc.d/init.d/apache
|
||||
etc/rc.d/init.d/aws
|
||||
etc/rc.d/init.d/localnet
|
||||
etc/rc.d/init.d/networking/red.down/10-static-routes
|
||||
etc/rc.d/init.d/partresize
|
||||
etc/rc.d/init.d/static-routes
|
||||
etc/ssh/ssh_config
|
||||
etc/ssh/sshd_config
|
||||
etc/sysctl.conf
|
||||
etc/unbound/unbound.conf
|
||||
opt/pakfire/lib/functions.pl
|
||||
opt/pakfire/pakfire
|
||||
srv/web/ipfire/cgi-bin/backup.cgi
|
||||
srv/web/ipfire/cgi-bin/firewall.cgi
|
||||
srv/web/ipfire/cgi-bin/fwhosts.cgi
|
||||
srv/web/ipfire/cgi-bin/ids.cgi
|
||||
srv/web/ipfire/cgi-bin/index.cgi
|
||||
srv/web/ipfire/cgi-bin/pakfire.cgi
|
||||
srv/web/ipfire/cgi-bin/vpnmain.cgi
|
||||
srv/web/ipfire/html/redirect-templates/legacy/template.html
|
||||
usr/bin/install-bootloader
|
||||
usr/local/bin/backupiso
|
||||
usr/local/bin/rebuild-initrd
|
||||
var/ipfire/backup/bin/backup.pl
|
||||
var/ipfire/backup/exclude
|
||||
var/ipfire/backup/include
|
||||
var/ipfire/langs
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/i586/grub
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/i586/linux
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/i586/linux-initrd
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/iproute2
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/ntp
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/openssh
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/parted
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/pciutils
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/rng-tools
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/x86_64/efibootmgr
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/x86_64/efivar
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/x86_64/grub
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/x86_64/linux
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/x86_64/linux-initrd
|
||||
@@ -1,162 +0,0 @@
|
||||
#!/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=124
|
||||
|
||||
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
|
||||
|
||||
# Remove files
|
||||
|
||||
# Extract files
|
||||
extract_files
|
||||
|
||||
# update linker config
|
||||
ldconfig
|
||||
|
||||
# Update Language cache
|
||||
/usr/local/bin/update-lang-cache
|
||||
|
||||
# Apply local configuration to sshd_config
|
||||
/usr/local/bin/sshctrl
|
||||
|
||||
# Start services
|
||||
/etc/init.d/rngd restart
|
||||
/etc/init.d/ntp restart
|
||||
/etc/init.d/unbound restart
|
||||
|
||||
# Reload sysctl.conf
|
||||
sysctl -p
|
||||
|
||||
# Remove deprecated GRUB configuration option
|
||||
if [ -e "/etc/default/grub" ]; then
|
||||
sed -e "/^GRUB_FONT/d" -i /etc/default/grub
|
||||
fi
|
||||
|
||||
# Update bootloader
|
||||
if [ -e /usr/bin/install-bootloader ]; then
|
||||
/usr/bin/install-bootloader
|
||||
fi
|
||||
|
||||
# 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
|
||||
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...
|
||||
if [ ! -e /opt/pakfire/db/installed/meta-linux-pae ]; then
|
||||
touch /var/run/need_reboot
|
||||
fi
|
||||
|
||||
# Finish
|
||||
/etc/init.d/fireinfo start
|
||||
sendprofile
|
||||
|
||||
# Update grub config to display new core version
|
||||
if [ -e /boot/grub/grub.cfg ]; then
|
||||
grub-mkconfig -o /boot/grub/grub.cfg
|
||||
fi
|
||||
|
||||
sync
|
||||
|
||||
# Don't report the exitcode last command
|
||||
exit 0
|
||||
4
config/rootfiles/core/127/filelists/files
Normal file
4
config/rootfiles/core/127/filelists/files
Normal file
@@ -0,0 +1,4 @@
|
||||
etc/system-release
|
||||
etc/issue
|
||||
srv/web/ipfire/cgi-bin/credits.cgi
|
||||
var/ipfire/langs
|
||||
1
config/rootfiles/core/127/filelists/fireinfo
Symbolic link
1
config/rootfiles/core/127/filelists/fireinfo
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/fireinfo
|
||||
62
config/rootfiles/core/127/update.sh
Normal file
62
config/rootfiles/core/127/update.sh
Normal file
@@ -0,0 +1,62 @@
|
||||
#!/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=127
|
||||
|
||||
# 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
|
||||
|
||||
# Stop services
|
||||
|
||||
# Remove files
|
||||
|
||||
# Extract files
|
||||
extract_files
|
||||
|
||||
# update linker config
|
||||
ldconfig
|
||||
|
||||
# Update Language cache
|
||||
/usr/local/bin/update-lang-cache
|
||||
|
||||
# Start services
|
||||
/etc/init.d/unbound restart
|
||||
|
||||
# Finish
|
||||
/etc/init.d/fireinfo start
|
||||
sendprofile
|
||||
|
||||
# Update grub config to display new core version
|
||||
if [ -e /boot/grub/grub.cfg ]; then
|
||||
grub-mkconfig -o /boot/grub/grub.cfg
|
||||
fi
|
||||
|
||||
sync
|
||||
|
||||
# Don't report the exitcode last command
|
||||
exit 0
|
||||
Reference in New Issue
Block a user