From af9a707dd47cce91976c8ce9cf6df84708db487b Mon Sep 17 00:00:00 2001 From: Ian Tangney Date: Tue, 9 Jan 2024 21:49:02 +0000 Subject: [PATCH 1/5] KASM-5419 Test LD_LIBRARY_PATH fix for recording --- src/ubuntu/install/recorder/install_recorder.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ubuntu/install/recorder/install_recorder.sh b/src/ubuntu/install/recorder/install_recorder.sh index 6bc0f0d..c4f2991 100644 --- a/src/ubuntu/install/recorder/install_recorder.sh +++ b/src/ubuntu/install/recorder/install_recorder.sh @@ -2,8 +2,8 @@ ### every exit != 0 fails the script set -e -COMMIT_ID="b9f195d8aac56b3127be9083470bddc360e30377" -BRANCH="main" +COMMIT_ID="75cf09992503e77a94b5f5c4deba7fc1daad4f5a" +BRANCH="bugfix_KASM-5419_fix_session_recorder_on_all_distros" COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') From 79cd2ab33415a67984c46df13dce1f7facfcfe6e Mon Sep 17 00:00:00 2001 From: Ian Tangney Date: Wed, 10 Jan 2024 16:59:58 +0000 Subject: [PATCH 2/5] KASM-5419 Ensure correct packages are installed for recorder startup in alpine --- src/ubuntu/install/recorder/install_recorder.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/ubuntu/install/recorder/install_recorder.sh b/src/ubuntu/install/recorder/install_recorder.sh index c4f2991..fe2d314 100644 --- a/src/ubuntu/install/recorder/install_recorder.sh +++ b/src/ubuntu/install/recorder/install_recorder.sh @@ -2,6 +2,12 @@ ### every exit != 0 fails the script set -e +if [[ "${DISTRO}" == "alpine" ]]; then + apk add --no-cache \ + runuser \ + xhost +fi + COMMIT_ID="75cf09992503e77a94b5f5c4deba7fc1daad4f5a" BRANCH="bugfix_KASM-5419_fix_session_recorder_on_all_distros" COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) From 5dc27023a5adb6974b7c22719d8c8cf5d8db9f54 Mon Sep 17 00:00:00 2001 From: Ian Tangney Date: Wed, 10 Jan 2024 17:00:19 +0000 Subject: [PATCH 3/5] KASM-5419 Don't use sudo as we already run as root --- src/common/scripts/kasm_hook_scripts/kasm_recorder_startup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/scripts/kasm_hook_scripts/kasm_recorder_startup.sh b/src/common/scripts/kasm_hook_scripts/kasm_recorder_startup.sh index 7a71b15..74d1f4c 100755 --- a/src/common/scripts/kasm_hook_scripts/kasm_recorder_startup.sh +++ b/src/common/scripts/kasm_hook_scripts/kasm_recorder_startup.sh @@ -2,8 +2,8 @@ set -e mkdir -p /opt/kasm/recordings -sudo chown kasm-recorder:kasm-recorder /opt/kasm/recordings -sudo chmod 700 /opt/kasm/recordings +chown kasm-recorder:kasm-recorder /opt/kasm/recordings +chmod 700 /opt/kasm/recordings # wait until X display is avaiable and allow the recorder to connect to it while ! xhost +SI:localuser:kasm-recorder 2>/dev/null; do From 445d4da21374a14e65c86bf25c8b66dfb611830a Mon Sep 17 00:00:00 2001 From: Ian Tangney Date: Wed, 10 Jan 2024 19:35:34 +0000 Subject: [PATCH 4/5] KASM-5419 Use nonfree ffmpeg packages for opensuse so we have libx264 --- src/ubuntu/install/recorder/install_recorder.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ubuntu/install/recorder/install_recorder.sh b/src/ubuntu/install/recorder/install_recorder.sh index fe2d314..e8d4ecf 100644 --- a/src/ubuntu/install/recorder/install_recorder.sh +++ b/src/ubuntu/install/recorder/install_recorder.sh @@ -6,6 +6,10 @@ if [[ "${DISTRO}" == "alpine" ]]; then apk add --no-cache \ runuser \ xhost +elif [ "${DISTRO}" == "opensuse" ]; then + zypper ar -cfp 90 'https://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_$releasever/' packman + zypper -n --gpg-auto-import-keys dup --from packman --allow-vendor-change + zypper install -ny xhost fi COMMIT_ID="75cf09992503e77a94b5f5c4deba7fc1daad4f5a" From 919ad16e90d08d58b544e64341576a0bb367d599 Mon Sep 17 00:00:00 2001 From: Richard Koliser Date: Fri, 12 Jan 2024 21:22:23 -0500 Subject: [PATCH 5/5] KASM-5419 update with build of recorder service after merge --- src/ubuntu/install/recorder/install_recorder.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ubuntu/install/recorder/install_recorder.sh b/src/ubuntu/install/recorder/install_recorder.sh index e8d4ecf..d7e4e04 100644 --- a/src/ubuntu/install/recorder/install_recorder.sh +++ b/src/ubuntu/install/recorder/install_recorder.sh @@ -12,8 +12,8 @@ elif [ "${DISTRO}" == "opensuse" ]; then zypper install -ny xhost fi -COMMIT_ID="75cf09992503e77a94b5f5c4deba7fc1daad4f5a" -BRANCH="bugfix_KASM-5419_fix_session_recorder_on_all_distros" +COMMIT_ID="9abeb2d5fba0bfe90d3fe60457a58ccc3ed1ad1d" +BRANCH="main" COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')