]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commitdiff
Core Update 170: Ship kernel and regenerate initial ramdisks locally
authorPeter Müller <peter.mueller@ipfire.org>
Thu, 28 Jul 2022 13:41:12 +0000 (13:41 +0000)
committerPeter Müller <peter.mueller@ipfire.org>
Thu, 28 Jul 2022 13:41:12 +0000 (13:41 +0000)
Per https://lists.ipfire.org/pipermail/development/2022-July/013889.html,
we ship the updated kernel in Core Update 170, but generate the initial
ramdisks locally to save space.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
config/rootfiles/core/170/filelists/aarch64/linux [new symlink]
config/rootfiles/core/170/filelists/armv6l/linux [new symlink]
config/rootfiles/core/170/filelists/x86_64/linux [new symlink]
config/rootfiles/core/170/update.sh

diff --git a/config/rootfiles/core/170/filelists/aarch64/linux b/config/rootfiles/core/170/filelists/aarch64/linux
new file mode 120000 (symlink)
index 0000000..3a2532b
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/aarch64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/170/filelists/armv6l/linux b/config/rootfiles/core/170/filelists/armv6l/linux
new file mode 120000 (symlink)
index 0000000..aee1f4d
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/armv6l/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/170/filelists/x86_64/linux b/config/rootfiles/core/170/filelists/x86_64/linux
new file mode 120000 (symlink)
index 0000000..0615b5b
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
\ No newline at end of file
index 9e96e3467129efb40dc32cca837b25a2b31b1b7d..d9f13d4dec5a4f99acefc8ed26ea6a7aa3722af6 100644 (file)
 
 core=170
 
+exit_with_error() {
+    # Set last succesfull installed core.
+    echo $(($core-1)) > /opt/pakfire/db/core/mine
+    # force fsck at next boot, this may fix free space on xfs
+    touch /forcefsck
+    # 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
@@ -34,6 +46,44 @@ done
 # Stop services
 /etc/init.d/rc.d/unbound stop
 
+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 prior to the kernel update
+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 100000 ]; then
+    exit_with_error "ERROR cannot update because not enough free space on root." 2
+    exit 2
+fi
+
+# Remove the old kernel
+rm -rvf \
+       /boot/System.map-* \
+       /boot/config-* \
+       /boot/ipfirerd-* \
+       /boot/initramfs-* \
+       /boot/vmlinuz-* \
+       /boot/uImage-* \
+       /boot/zImage-* \
+       /boot/uInit-* \
+       /boot/dtb-* \
+       /lib/modules
+
 # Remove files
 rm -rvf \
        /lib/ld-2.* \
@@ -126,6 +176,19 @@ sed -i /etc/collectd.conf \
 # Harden mount options of /boot
 sed -e -i "s@[[:space:]]*\/boot[[:space:]]*auto[[:space:]]*defaults[[:space:]]*@ \/boot    auto defaults,nodev,noexec,nosuid   @g" /etc/fstab
 
+# Regenerate all initrds
+dracut --regenerate-all --force
+case "$(uname -m)" in
+       armv*)
+               mkimage -A arm -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire
+               rm /boot/initramfs-${KVER}-ipfire.img
+               ;;
+       aarch64)
+               mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire
+               # dont remove initramfs because grub need this to boot.
+               ;;
+esac
+
 # This update needs a reboot...
 touch /var/run/need_reboot
 
@@ -133,6 +196,20 @@ touch /var/run/need_reboot
 /etc/init.d/fireinfo start
 sendprofile
 
+# remove lm_sensor config after collectd was started
+# to reserch sensors at next boot with updated kernel
+rm -f  /etc/sysconfig/lm_sensors
+
+# Upadate Kernel version in 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
+
 # Update grub config to display new core version
 if [ -e /boot/grub/grub.cfg ]; then
        grub-mkconfig -o /boot/grub/grub.cfg