mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 03:33:25 +02:00
core104: add kernel to updater
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
1
config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood
Symbolic link
1
config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/armv5tel/linux-kirkwood
|
||||
1
config/rootfiles/core/104/filelists/armv5tel/linux-multi
Symbolic link
1
config/rootfiles/core/104/filelists/armv5tel/linux-multi
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/armv5tel/linux-multi
|
||||
1
config/rootfiles/core/104/filelists/armv5tel/linux-rpi
Symbolic link
1
config/rootfiles/core/104/filelists/armv5tel/linux-rpi
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/armv5tel/linux-rpi
|
||||
1
config/rootfiles/core/104/filelists/i586/linux
Symbolic link
1
config/rootfiles/core/104/filelists/i586/linux
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/i586/linux
|
||||
1
config/rootfiles/core/104/filelists/x86_64/linux
Symbolic link
1
config/rootfiles/core/104/filelists/x86_64/linux
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/x86_64/linux
|
||||
@@ -24,6 +24,36 @@
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
|
||||
function find_device() {
|
||||
local mountpoint="${1}"
|
||||
|
||||
local root
|
||||
local dev mp fs flags rest
|
||||
while read -r dev mp fs flags rest; do
|
||||
# Skip unwanted entries
|
||||
[ "${dev}" = "rootfs" ] && continue
|
||||
|
||||
if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then
|
||||
root="$(basename "${dev}")"
|
||||
break
|
||||
fi
|
||||
done < /proc/mounts
|
||||
|
||||
# Get the actual device from the partition that holds /
|
||||
while [ -n "${root}" ]; do
|
||||
if [ -e "/sys/block/${root}" ]; then
|
||||
echo "${root}"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Remove last character
|
||||
root="${root::-1}"
|
||||
done
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
|
||||
core=104
|
||||
|
||||
function exit_with_error() {
|
||||
@@ -40,11 +70,73 @@ do
|
||||
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
|
||||
done
|
||||
|
||||
#
|
||||
# Do some sanity checks.
|
||||
case $(uname -r) in
|
||||
*-ipfire* )
|
||||
# Ok.
|
||||
;;
|
||||
* )
|
||||
exit_with_error "ERROR cannot update. No IPFire Kernel." 1
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
#
|
||||
#
|
||||
KVER="xxxKVERxxx"
|
||||
|
||||
# Check diskspace on root
|
||||
ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
|
||||
|
||||
if [ $ROOTSPACE -lt 100000 ]; then
|
||||
exit_with_error "ERROR cannot update because not enough free space on root." 2
|
||||
exit 2
|
||||
fi
|
||||
|
||||
echo
|
||||
echo Update Kernel to $KVER ...
|
||||
#
|
||||
# Remove old kernel, configs, initrd, modules, dtb's ...
|
||||
#
|
||||
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
|
||||
|
||||
case "$(uname -m)" in
|
||||
armv*)
|
||||
# Backup uEnv.txt if exist
|
||||
if [ -e /boot/uEnv.txt ]; then
|
||||
cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
|
||||
fi
|
||||
|
||||
# work around the u-boot folder detection bug
|
||||
mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
|
||||
mkdir -pv /boot/dtb-$KVER-ipfire-multi
|
||||
touch /boot/uImage-ipfire-kirkwood
|
||||
touch /boot/zImage-ipfire-multi
|
||||
touch /boot/uIinit-ipfire-kirkwood
|
||||
touch /boot/uIinit-ipfire-multi
|
||||
;;
|
||||
esac
|
||||
|
||||
# Stop services
|
||||
/etc/init.d/collectd stop
|
||||
/etc/init.d/snort stop
|
||||
/etc/init.d/squid stop
|
||||
/etc/init.d/dnsmasq stop
|
||||
/etc/init.d/ipsec stop
|
||||
/etc/init.d/apache stop
|
||||
|
||||
# Extract files
|
||||
extract_files
|
||||
tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
|
||||
|
||||
# Remove some old files
|
||||
rm -f /bin/groups /lib/libshadow.so.0*
|
||||
@@ -52,22 +144,105 @@ rm -f /bin/groups /lib/libshadow.so.0*
|
||||
# update linker config
|
||||
ldconfig
|
||||
|
||||
# Check diskspace on boot
|
||||
BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
|
||||
|
||||
if [ $BOOTSPACE -lt 1000 ]; then
|
||||
case $(uname -r) in
|
||||
*-ipfire-kirkwood )
|
||||
# Special handling for old kirkwood images.
|
||||
# (install only kirkwood kernel)
|
||||
rm -rf /boot/*
|
||||
# work around the u-boot folder detection bug
|
||||
mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
|
||||
tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \
|
||||
--numeric-owner -C / --wildcards 'boot/*-kirkwood*'
|
||||
;;
|
||||
* )
|
||||
/etc/init.d/apache start
|
||||
exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Update Language cache
|
||||
/usr/local/bin/update-lang-cache
|
||||
|
||||
#
|
||||
# Start services
|
||||
/etc/init.d/dnsmasq restart
|
||||
#
|
||||
/etc/init.d/collectd start
|
||||
/etc/init.d/snort restart
|
||||
/etc/init.d/apache start
|
||||
/etc/init.d/dnsmasq start
|
||||
/etc/init.d/sshd restart
|
||||
/etc/init.d/squid start
|
||||
/etc/init.d/snort start
|
||||
if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
|
||||
/etc/init.d/ipsec start
|
||||
fi
|
||||
|
||||
# Delete old QoS enabled indicator
|
||||
rm -f /var/ipfire/qos/enable
|
||||
|
||||
# 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 12000 -o $ROOTSPACE -lt 90000 ]; 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
|
||||
#
|
||||
# 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
|
||||
|
||||
# This update need a reboot...
|
||||
touch /var/run/need_reboot
|
||||
sync
|
||||
|
||||
# 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
|
||||
|
||||
Reference in New Issue
Block a user