iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use latest btrfs-progs to match linux-libre
[automated-distro-installer]
/
fai
/
config
/
scripts
/
IANK
/
11-iank
diff --git
a/fai/config/scripts/IANK/11-iank
b/fai/config/scripts/IANK/11-iank
index 6c9c9bf1f29ce87929ba1d3283253908a0b02c9f..6efc767dc344021a59875811401c271928bb62b9 100755
(executable)
--- a/
fai/config/scripts/IANK/11-iank
+++ b/
fai/config/scripts/IANK/11-iank
@@
-224,13
+224,9
@@
EOF
fi
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)
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
;;
*)
$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 \
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}
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
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