X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FIANK%2F11-iank;fp=fai%2Fconfig%2Fscripts%2FIANK%2F11-iank;h=6efc767dc344021a59875811401c271928bb62b9;hp=0c26e528401fbf27fed87766bd9a713058736132;hb=8716af32fa1f2822286917a1acf399d80df824be;hpb=3689844021231feed124fc02f46d66f11e0e4a67 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