extern/workspaces-core-images
1
0
Fork 0
mirror of https://github.com/kasmtech/workspaces-core-images.git synced 2024-11-21 23:13:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/KASM-4027-rhel-9-fixes' into 'develop'

Browse Source 
KASM-4027 detect changes to rhel script, update repo names splashed on...

Closes KASM-4027

See merge request kasm-technologies/internal/workspaces-core-images!230
This commit is contained in:
Richard Koliser 2024-10-28 20:16:12 +00:00
commit 91b634b923
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ubuntu/install/audio/install_audio.sh
View File

@ -17,7 +17,9 @@ elif [ "${DISTRO}" == "oracle8" ]; then
dnf install -y ffmpeg pulseaudio-utils dnf install -y ffmpeg pulseaudio-utils
elif [[ "${DISTRO}" == @(oracle9|rhel9) ]]; then elif [[ "${DISTRO}" == @(oracle9|rhel9) ]]; then
dnf install -y --allowerasing curl git dnf install -y --allowerasing curl git
dnf config-manager --set-enabled ol9_codeready_builder if [[ "${DISTRO}" == "oracle9" ]]; then
dnf config-manager --set-enabled ol9_codeready_builder
fi
dnf localinstall -y --nogpgcheck https://download1.rpmfusion.org/free/el/rpmfusion-free-release-9.noarch.rpm dnf localinstall -y --nogpgcheck https://download1.rpmfusion.org/free/el/rpmfusion-free-release-9.noarch.rpm
dnf install -y --allowerasing ffmpeg pulseaudio-utils pulseaudio dnf install -y --allowerasing ffmpeg pulseaudio-utils pulseaudio
elif [[ "${DISTRO}" == @(rockylinux9|almalinux9) ]]; then elif [[ "${DISTRO}" == @(rockylinux9|almalinux9) ]]; then

2
src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh
View File

@ -7,7 +7,7 @@ prepare_rpm_repo_dependencies() {
elif [[ "$DISTRO" = "oracle8" ]]; then elif [[ "$DISTRO" = "oracle8" ]]; then
dnf config-manager --set-enabled ol8_codeready_builder dnf config-manager --set-enabled ol8_codeready_builder
dnf install -y oracle-epel-release-el8 dnf install -y oracle-epel-release-el8
elif [[ "${DISTRO}" == @(oracle9|rhel9) ]]; then elif [[ "${DISTRO}" == "oracle9" ]]; then
dnf config-manager --set-enabled ol9_codeready_builder dnf config-manager --set-enabled ol9_codeready_builder
dnf install -y oracle-epel-release-el9 dnf install -y oracle-epel-release-el9
fi fi

21
src/ubuntu/install/rhel/install_rhel.sh
View File

@ -9,29 +9,29 @@ fi
# Add OL9 repos to RHEL # Add OL9 repos to RHEL
cat >>/etc/yum.repos.d/oracle-linux-ol9.repo <<EOL cat >>/etc/yum.repos.d/oracle-linux-ol9.repo <<EOL
[ol9_appstream] [el9_appstream]
name=RHEL Application Stream Packages (\$basearch) name=Enterprise Linux Application Stream Packages (\$basearch)
baseurl=https://yum.oracle.com/repo/OracleLinux/OL9/appstream/\$basearch/ baseurl=https://yum.oracle.com/repo/OracleLinux/OL9/appstream/\$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1 gpgcheck=1
enabled=1 enabled=1
[ol9_codeready_builder] [el9_codeready_builder]
name=RHEL CodeReady Builder (\$basearch) - (Unsupported) name=Enterprise Linux CodeReady Builder (\$basearch)
baseurl=https://yum.oracle.com/repo/OracleLinux/OL9/codeready/builder/\$basearch/ baseurl=https://yum.oracle.com/repo/OracleLinux/OL9/codeready/builder/\$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1 gpgcheck=1
enabled=1 enabled=1
[ol9_baseos_latest] [el9_baseos_latest]
name=RHEL BaseOS Latest (\$basearch) name=Enterprise Linux BaseOS Latest (\$basearch)
baseurl=https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/\$basearch/ baseurl=https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/\$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1 gpgcheck=1
enabled=1 enabled=1
[ol9_distro_builder] [el9_distro_builder]
name=RHEL Distro Builder (\$basearch) - (Unsupported) name=Enterprise Linux Distro Builder (\$basearch)
baseurl=https://yum.oracle.com/repo/OracleLinux/OL9/distro/builder/\$basearch/ baseurl=https://yum.oracle.com/repo/OracleLinux/OL9/distro/builder/\$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1 gpgcheck=1
@ -145,3 +145,8 @@ RgwnCPfIai7lLNx95bdwB8U2NpY11OXsoTLZAA==
=UWTf =UWTf
-----END PGP PUBLIC KEY BLOCK----- -----END PGP PUBLIC KEY BLOCK-----
EOL EOL
# Disable subscription manager
sed -i \
's/enabled=1/enabled=0/g' \
/etc/yum/pluginconf.d/subscription-manager.conf

6
src/ubuntu/install/xfce/install_xfce_ui.sh
View File

@ -112,8 +112,10 @@ elif [ "$DISTRO" = "oracle8" ]; then
xfce4-notifyd \ xfce4-notifyd \
xset xset
elif [[ "${DISTRO}" == @(oracle9|rhel9) ]]; then elif [[ "${DISTRO}" == @(oracle9|rhel9) ]]; then
dnf config-manager --set-enabled ol9_codeready_builder if [[ "${DISTRO}" == "oracle9" ]]; then
dnf config-manager --set-enabled ol9_distro_builder dnf config-manager --set-enabled ol9_codeready_builder
dnf config-manager --set-enabled ol9_distro_builder
fi
dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
dnf group install xfce -y -x oracle-backgrounds dnf group install xfce -y -x oracle-backgrounds
dnf install -y \ dnf install -y \