From 266fed04542f1d9755845347b507bed278d5b603 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Tue, 26 Jan 2021 16:11:14 -0600 Subject: [PATCH] Fix kernel selection, using HWE by default. --- add-jibri-node.sh | 4 ++-- quick_jibri_installer.sh | 4 ++-- tools/test-jibri-env.sh | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/add-jibri-node.sh b/add-jibri-node.sh index 3b7a2d1..3744601 100644 --- a/add-jibri-node.sh +++ b/add-jibri-node.sh @@ -220,8 +220,8 @@ fi } echo "# Check and Install HWE kernel if possible..." -HWE_VIR_MOD=$(apt-cache madison linux-modules-extra-virtual-hwe-$(lsb_release -sr) 2>/dev/null|head -n1|grep -c "extra-virtual-hwe") -if [ "$HWE_VIR_MOD" == "1" ]; then +HWE_VIR_MOD=$(apt-cache madison linux-image-generic-hwe-$(lsb_release -sr) 2>/dev/null|head -n1|grep -c "hwe-$(lsb_release -sr)") +if [ "$HWE_VIR_MOD" = "1" ]; then apt-get -y install \ linux-image-generic-hwe-$(lsb_release -sr) \ linux-modules-extra-virtual-hwe-$(lsb_release -sr) diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh index 16fabda..d33d8df 100644 --- a/quick_jibri_installer.sh +++ b/quick_jibri_installer.sh @@ -298,8 +298,8 @@ apt-get -y install \ wget echo "# Check and Install HWE kernel if possible..." -HWE_VIR_MOD=$(apt-cache madison linux-modules-extra-virtual-hwe-$(lsb_release -sr) 2>/dev/null|head -n1|grep -c "extra-virtual-hwe") -if [ "$HWE_VIR_MOD" == "1" ]; then +HWE_VIR_MOD=$(apt-cache madison linux-image-generic-hwe-$(lsb_release -sr) 2>/dev/null|head -n1|grep -c "hwe-$(lsb_release -sr)") +if [ "$HWE_VIR_MOD" = "1" ]; then apt-get -y install \ linux-image-generic-hwe-$(lsb_release -sr) \ linux-modules-extra-virtual-hwe-$(lsb_release -sr) diff --git a/tools/test-jibri-env.sh b/tools/test-jibri-env.sh index 8e2fc38..3028eab 100644 --- a/tools/test-jibri-env.sh +++ b/tools/test-jibri-env.sh @@ -36,7 +36,7 @@ apt-get -yq2 install apt-show-versions JITSI_REPO=$(apt-cache policy | grep http | grep jitsi | grep stable | awk '{print $3}' | head -n 1 | cut -d "/" -f1) SND_AL_MODULE=$(lsmod | awk '{print$1}'| grep snd_aloop) -HWE_VIR_MOD=$(apt-cache madison linux-modules-extra-virtual-hwe-$(lsb_release -sr) 2>/dev/null|head -n1|grep -c "extra-virtual-hwe") +HWE_VIR_MOD=$(apt-cache madison linux-image-generic-hwe-$(lsb_release -sr) 2>/dev/null|head -n1|grep -c "hwe-$(lsb_release -sr)") CONF_JSON="/etc/jitsi/jibri/config.json" JIBRI_CONF="/etc/jitsi/jibri/jibri.conf" CHD_VER="$(/usr/local/bin/chromedriver --version 2>/dev/null| awk '{print$1,$2}')" @@ -104,12 +104,13 @@ fi echo -e "\n#4 -- Test kernel modules --\n" if [ -z $SND_AL_MODULE ]; then #First make sure the recommended kernel is installed. - if [ "$HWE_VIR_MOD" == "1" ]; then + if [ "$HWE_VIR_MOD" = "1" ]; then apt-get -y install \ linux-image-generic-hwe-$(lsb_release -sr) \ linux-modules-extra-virtual-hwe-$(lsb_release -sr) - else + else apt-get -y install \ + linux-image-generic \ linux-modules-extra-$(uname -r) fi echo -e "\nNo module snd_aloop detected. \xE2\x9C\x96 <== IMPORTANT! \nCurrent kernel: $(uname -r)\n"