From a15c2ba88789fd9a37bd5a860fda1b3877999421 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Wed, 17 Apr 2024 22:58:40 -0400 Subject: [PATCH] split out stable kernel install into separate script --- .../install-stable-kernel-debs | 56 +++++++++++++++++++ fai/config/scripts/IANK/11-iank | 36 ++---------- 2 files changed, 61 insertions(+), 31 deletions(-) create mode 100755 fai/config/distro-install-common/install-stable-kernel-debs diff --git a/fai/config/distro-install-common/install-stable-kernel-debs b/fai/config/distro-install-common/install-stable-kernel-debs new file mode 100755 index 0000000..8377490 --- /dev/null +++ b/fai/config/distro-install-common/install-stable-kernel-debs @@ -0,0 +1,56 @@ +#!/bin/bash -x +# This file is part of Ian Kelling's automated-distro-installer +# Copyright (C) 2024 Ian Kelling + +# This program 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 2 +# of the License, or (at your option) any later version. + +# This program 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 this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +set -eE -o pipefail +trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR + +[[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@" + +tmpdir=$(mktemp -d) || exit +trap 'cd; rm -rf "$tmpdir"' EXIT +cd $tmpdir + +# update ver= when we are ready to jump to a new stable kernel. +# note: this is duplicated in 11-iank. +# Stable kernels are listed here: https://www.kernel.org/category/releases.html +ver='6\.6' +va=$(curl -s https://kernel.ubuntu.com/mainline/ | \ + sed -rn 's,.*alt="\[DIR\]".*href="([^/]+).*,\1,p' | \ + grep -v -- -rc | sed 's/^v//' | grep "^$ver" | sort -V | tail -n1) + +# note the wiki page about these says to install linux-headers.*generic.*amd64, but +# as of 2024, they have a requirement of a very new glibc, and people report +# that installing it is not needed. +tmpstr=$(curl -s https://kernel.ubuntu.com/mainline/v$va/amd64/CHECKSUMS | awk '$2 ~ /^linux-/ { print $2 }' | sort -u | grep -iv 'linux-headers.*generic.*amd64' ) +mapfile -t pkgs <<<"$tmpstr" + +if (( ${#pkgs[@]} != 3 )); then + echo "$0: error. expected to find 3 kernel packages, got: ${pkgs[*]}" >&2 + exit 1 +fi + +urls=() +for p in ${pkgs[@]}; do + if ! dpkg -s -- "${p%%_*}" 2>&1 | grep -Fx "Status: install ok installed" &>/dev/null; then + urls+=(https://kernel.ubuntu.com/mainline/v$va/amd64/$p) + fi +done +if (( ${#urls[@]} >= 1 )); then + wget "${urls[@]}" + dpkg -i *.deb +fi diff --git a/fai/config/scripts/IANK/11-iank b/fai/config/scripts/IANK/11-iank index 9879863..6c9c9bf 100755 --- a/fai/config/scripts/IANK/11-iank +++ b/fai/config/scripts/IANK/11-iank @@ -225,38 +225,12 @@ EOF fi # for new btrfs features, get latest stable kernel and btrfs progs, -# update ver= as needed. +# update ver= when we are ready to jump to a new stable kernel. +# note: this is duplicated in install-stable-kernel-debs. +ver='6\.6' case $HOSTNAME in sy) - mkdir -p $FAI_ROOT/tmp/kernel-debs - files=($FAI_ROOT/tmp/kernel-debs/*) - if (( ${#files[@]} >= 1 )); then - rm -rf "${files[@]}" - fi - cd $FAI_ROOT/tmp/kernel-debs - ver='6\.6' - va=$(curl -s https://kernel.ubuntu.com/mainline/ | \ - sed -rn 's,.*alt="\[DIR\]".*href="([^/]+).*,\1,p' | \ - grep -v -- -rc | sed 's/^v//' | grep "^$ver" | sort -V | tail -n1) - - # note the wiki page about these says to install linux-headers.*generic.*amd64, but - # as of 2024, they have a requirement of a very new glibc, and people report - # that installing it is not needed. - pkgs=$(curl -s https://kernel.ubuntu.com/mainline/v$va/amd64/CHECKSUMS | awk '$2 ~ /^linux-/ { print $2 }' | sort -u | grep -iv 'linux-headers.*generic.*amd64' ) - - urls=() - for p in $pkgs; do - if ! dpkg -s -- "${p%%_*}" 2>&1 | grep -Fx "Status: install ok installed" &>/dev/null; then - urls+=(https://kernel.ubuntu.com/mainline/v$va/amd64/$p) - fi - done - if (( ${#urls[@]} >= 1 )); then - wget "${urls[@]}" - $chroot bash </dev/null | awk '{print $2}') ||: if [[ $ver != "$cur_ver" ]]; then - if [[ $HOST2 == $HOSTNAME && $ver != "$($bprogs_dir/btrfs --version 2>/dev/null | awk '{print $2}')" ]]; then + if [[ $HOST2 == "$HOSTNAME" && $ver != "$($bprogs_dir/btrfs --version 2>/dev/null | awk '{print $2}')" ]]; then rm -rf $bprogs_dir cd /tmp wget $url -- 2.30.2