From d8024901625ccaec69197c28a7c6db34cc7ce616 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Sun, 14 Apr 2024 16:54:40 -0400 Subject: [PATCH] ip config changes, do kernel upgrades --- fai-redep | 2 +- fai/config/scripts/IANK/11-iank | 72 ++++++++++++++++++++++++--------- wrt-setup-local | 26 ++++++++---- 3 files changed, 73 insertions(+), 27 deletions(-) diff --git a/fai-redep b/fai-redep index de195d5..5e08b2f 100755 --- a/fai-redep +++ b/fai-redep @@ -76,7 +76,7 @@ install --owner=iank --group=iank -d fai/config/files/usr/local/bin/hssh install --owner=iank --group=iank -d fai/config/files/usr/local/bin/ssh_filter_btrbk.sh rsync -atL /a/opt/btrbk/ssh_filter_btrbk.sh fai/config/files/usr/local/bin/ssh_filter_btrbk.sh/STANDARD -m rsync -rlpt --delete --relative --exclude /fai/config/basefiles/ fai/config /a/opt/btrfs-progs-release/btrfs-progs-v6.3.2 "${rpre[@]}"/srv +m rsync -rlpt --delete --relative --exclude /fai/config/basefiles/ fai/config /a/opt/btrfs-progs-release "${rpre[@]}"/srv # todo: automatically disable faiserver after a period so # these files are not available. diff --git a/fai/config/scripts/IANK/11-iank b/fai/config/scripts/IANK/11-iank index 0b8d6c5..1aa9740 100755 --- a/fai/config/scripts/IANK/11-iank +++ b/fai/config/scripts/IANK/11-iank @@ -19,8 +19,11 @@ if [[ -e /a/bin/fai/fai-wrapper ]]; then } fi -if [[ $FAI_ROOT != / ]]; then - bprogs_pre=/srv +if [[ $FAI_ROOT == / ]]; then + source /a/bin/bash_unpublished/source-state + bprogs_dir=/a/opt/btrfs-progs-release +else + bprogs_dir=/srv/btrfs-progs-release chroot="chroot $FAI_ROOT" fi @@ -117,7 +120,7 @@ systemctl enable myncq.service /usr/bin/myncq no-upgrub EOFOUTER - ;; + ;;& # per rubens suggestion to make a d16 more stable kd|kw) cmdline+=" pci=realloc=off" ;; esac @@ -205,21 +208,33 @@ EOF fi -# for btrfs bug reporting, install latest kernel and btrfs progs, as of -# 2023-07-21 +# for new btrfs features, get latest stable kernel and btrfs progs, +# update ver= as needed. 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 - va=6.4.3 - vb=$va-060403 - vc=${vb}.202307110536 - pre="https://kernel.ubuntu.com/~kernel-ppa/mainline/v$va/amd64/linux-" - if ! dpkg -s -- linux-headers-${vb} 2>&1 | grep -Fx "Status: install ok installed" &>/dev/null; then - urls=( - ${pre}headers-${vb}_${vc}_all.deb - ${pre}{headers,image-unsigned,modules}-${vb}-generic_${vc}_amd64.deb - ) + 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 + rm -rf $bprogs_dir + cd /tmp + wget $url + sudo -u iank tar xzf $tarball + mv ${tarball%.tar.gz} $bprogs_dir + cd $bprogs_dir + apt-get -y build-dep btrfs-progs + sudo -u iank ./configure --disable-documentation + sudo -u iank make + make install + else + $chroot bash -xe <