From: Ian Kelling <iank@fsf.org>
Date: Thu, 18 Apr 2024 12:12:32 +0000 (-0400)
Subject: use latest btrfs-progs to match linux-libre
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=8716af32fa1f2822286917a1acf399d80df824be;p=automated-distro-installer

use latest btrfs-progs to match linux-libre
---

diff --git a/fai/config/distro-install-common/install-stable-kernel-debs b/fai/config/distro-install-common/install-stable-kernel-debs
index 8377490..c024796 100755
--- a/fai/config/distro-install-common/install-stable-kernel-debs
+++ b/fai/config/distro-install-common/install-stable-kernel-debs
@@ -25,13 +25,12 @@ 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.
+# update stable_ver when we are ready to jump to a new stable kernel.
 # Stable kernels are listed here: https://www.kernel.org/category/releases.html
-ver='6\.6'
+stable_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)
+       grep -v -- -rc | sed 's/^v//' | grep "^$stable_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
@@ -52,5 +51,5 @@ for p in ${pkgs[@]}; do
 done
 if (( ${#urls[@]} >= 1 )); then
   wget "${urls[@]}"
-  dpkg -i *.deb
+  dpkg -i ./*.deb
 fi
diff --git a/fai/config/scripts/IANK/11-iank b/fai/config/scripts/IANK/11-iank
index 0c26e52..6efc767 100755
--- a/fai/config/scripts/IANK/11-iank
+++ b/fai/config/scripts/IANK/11-iank
@@ -224,10 +224,6 @@ EOF
 
 fi
 
-# for new btrfs features, get latest stable kernel and btrfs progs,
-# 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)
     $FAI/distro-install-common/install-stable-kernel-debs
@@ -239,10 +235,10 @@ esac
 
 pre=https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs
 tarball=$(curl -s $pre/sha256sums.asc \
-            | awk '$2 ~ /^btrfs-progs-v/ { print $2 }' | grep -v -- -rc | grep "^btrfs-progs-v${ver}.*gz\$" | sort -V | tail -n1)
+            | awk '$2 ~ /^btrfs-progs-v/ { print $2 }' | grep -v -- -rc | grep "^btrfs-progs-v.*gz\$" | sort -V | tail -n1)
 url="$pre/$tarball"
 dir=${tarball%.tar.gz}
-ver=${dir#btrfs-progs}
+ver=${dir#btrfs-progs-}
 cur_ver=$(btrfs --version 2>/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