X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;ds=sidebyside;f=fai%2Fconfig%2Fscripts%2FIANK%2F11-iank;h=6efc767dc344021a59875811401c271928bb62b9;hb=8716af32fa1f2822286917a1acf399d80df824be;hp=6c9c9bf1f29ce87929ba1d3283253908a0b02c9f;hpb=a15c2ba88789fd9a37bd5a860fda1b3877999421;p=automated-distro-installer

diff --git a/fai/config/scripts/IANK/11-iank b/fai/config/scripts/IANK/11-iank
index 6c9c9bf..6efc767 100755
--- a/fai/config/scripts/IANK/11-iank
+++ b/fai/config/scripts/IANK/11-iank
@@ -224,13 +224,9 @@ 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/config/distro-install-common/install-stable-kernel-debs
+    $FAI/distro-install-common/install-stable-kernel-debs
     ;;
   *)
     $chroot apt-get -y install linux-libre
@@ -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