mirror of
https://github.com/kasmtech/workspaces-core-images.git
synced 2025-06-25 22:41:47 +02:00
Add Fedora 41 support
This commit is contained in:
Dmitry Maksyoma
parent
bc4eb81547
commit
5c4c09459a
@ -45,7 +45,12 @@ RUN mkdir -p $HOME/Desktop
|
||||
### (should be nss_wrapper), and yum would just ignore it. Thus, a necessary
|
||||
### package would be missing. With skip_missing_names_on_install, yum will exit
|
||||
### with 1 exit code and that will stop image building.
|
||||
RUN dnf install -y 'dnf-command(config-manager)' && dnf config-manager --setopt=skip_missing_names_on_install=False --save
|
||||
RUN dnf install -y 'dnf-command(config-manager)' && \
|
||||
if [ "${DISTRO}" == "fedora41" ]; then \
|
||||
dnf-3 config-manager --setopt=skip_missing_names_on_install=False --save; \
|
||||
else \
|
||||
dnf config-manager --setopt=skip_missing_names_on_install=False --save; \
|
||||
fi
|
||||
|
||||
### Install custom fonts
|
||||
COPY ./src/ubuntu/install/fonts $INST_SCRIPTS/fonts/
|
||||
|
||||
@ -0,0 +1,108 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<channel name="xfce4-desktop" version="1.0">
|
||||
<property name="backdrop" type="empty">
|
||||
<property name="screen0" type="empty">
|
||||
<property name="monitorVNC-0" type="empty">
|
||||
<property name="workspace0" type="empty">
|
||||
<property name="color-style" type="int" value="0"/>
|
||||
<property name="image-style" type="int" value="5"/>
|
||||
<property name="last-image" type="string" value="/usr/share/backgrounds/bg_default.png"/>
|
||||
</property>
|
||||
<property name="workspace1" type="empty">
|
||||
<property name="color-style" type="int" value="0"/>
|
||||
<property name="image-style" type="int" value="5"/>
|
||||
<property name="last-image" type="string" value="/usr/share/backgrounds/bg_default.png"/>
|
||||
</property>
|
||||
<property name="workspace2" type="empty">
|
||||
<property name="color-style" type="int" value="0"/>
|
||||
<property name="image-style" type="int" value="5"/>
|
||||
<property name="last-image" type="string" value="/usr/share/backgrounds/bg_default.png"/>
|
||||
</property>
|
||||
<property name="workspace3" type="empty">
|
||||
<property name="color-style" type="int" value="0"/>
|
||||
<property name="image-style" type="int" value="5"/>
|
||||
<property name="last-image" type="string" value="/usr/share/backgrounds/bg_default.png"/>
|
||||
</property>
|
||||
</property>
|
||||
<property name="monitorVNC-1" type="empty">
|
||||
<property name="workspace0" type="empty">
|
||||
<property name="color-style" type="int" value="0"/>
|
||||
<property name="image-style" type="int" value="5"/>
|
||||
<property name="last-image" type="string" value="/usr/share/backgrounds/bg_default.png"/>
|
||||
</property>
|
||||
<property name="workspace1" type="empty">
|
||||
<property name="color-style" type="int" value="0"/>
|
||||
<property name="image-style" type="int" value="5"/>
|
||||
<property name="last-image" type="string" value="/usr/share/backgrounds/bg_default.png"/>
|
||||
</property>
|
||||
<property name="workspace2" type="empty">
|
||||
<property name="color-style" type="int" value="0"/>
|
||||
<property name="image-style" type="int" value="5"/>
|
||||
<property name="last-image" type="string" value="/usr/share/backgrounds/bg_default.png"/>
|
||||
</property>
|
||||
<property name="workspace3" type="empty">
|
||||
<property name="color-style" type="int" value="0"/>
|
||||
<property name="image-style" type="int" value="5"/>
|
||||
<property name="last-image" type="string" value="/usr/share/backgrounds/bg_default.png"/>
|
||||
</property>
|
||||
</property>
|
||||
<property name="monitorVNC-2" type="empty">
|
||||
<property name="workspace0" type="empty">
|
||||
<property name="color-style" type="int" value="0"/>
|
||||
<property name="image-style" type="int" value="5"/>
|
||||
<property name="last-image" type="string" value="/usr/share/backgrounds/bg_default.png"/>
|
||||
</property>
|
||||
<property name="workspace1" type="empty">
|
||||
<property name="color-style" type="int" value="0"/>
|
||||
<property name="image-style" type="int" value="5"/>
|
||||
<property name="last-image" type="string" value="/usr/share/backgrounds/bg_default.png"/>
|
||||
</property>
|
||||
<property name="workspace2" type="empty">
|
||||
<property name="color-style" type="int" value="0"/>
|
||||
<property name="image-style" type="int" value="5"/>
|
||||
<property name="last-image" type="string" value="/usr/share/backgrounds/bg_default.png"/>
|
||||
</property>
|
||||
<property name="workspace3" type="empty">
|
||||
<property name="color-style" type="int" value="0"/>
|
||||
<property name="image-style" type="int" value="5"/>
|
||||
<property name="last-image" type="string" value="/usr/share/backgrounds/bg_default.png"/>
|
||||
</property>
|
||||
</property>
|
||||
<property name="monitorVNC-3" type="empty">
|
||||
<property name="workspace0" type="empty">
|
||||
<property name="color-style" type="int" value="0"/>
|
||||
<property name="image-style" type="int" value="5"/>
|
||||
<property name="last-image" type="string" value="/usr/share/backgrounds/bg_default.png"/>
|
||||
</property>
|
||||
<property name="workspace1" type="empty">
|
||||
<property name="color-style" type="int" value="0"/>
|
||||
<property name="image-style" type="int" value="5"/>
|
||||
<property name="last-image" type="string" value="/usr/share/backgrounds/bg_default.png"/>
|
||||
</property>
|
||||
<property name="workspace2" type="empty">
|
||||
<property name="color-style" type="int" value="0"/>
|
||||
<property name="image-style" type="int" value="5"/>
|
||||
<property name="last-image" type="string" value="/usr/share/backgrounds/bg_default.png"/>
|
||||
</property>
|
||||
<property name="workspace3" type="empty">
|
||||
<property name="color-style" type="int" value="0"/>
|
||||
<property name="image-style" type="int" value="5"/>
|
||||
<property name="last-image" type="string" value="/usr/share/backgrounds/bg_default.png"/>
|
||||
</property>
|
||||
</property>
|
||||
</property>
|
||||
</property>
|
||||
<property name="desktop-icons" type="empty">
|
||||
<property name="file-icons" type="empty">
|
||||
<property name="show-home" type="bool" value="false"/>
|
||||
<property name="show-filesystem" type="bool" value="false"/>
|
||||
<property name="show-trash" type="bool" value="false"/>
|
||||
<property name="show-removable" type="bool" value="false"/>
|
||||
</property>
|
||||
</property>
|
||||
<property name="last" type="empty">
|
||||
<property name="window-width" type="int" value="653"/>
|
||||
<property name="window-height" type="int" value="558"/>
|
||||
</property>
|
||||
</channel>
|
||||
@ -0,0 +1,37 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<channel name="xfce4-panel" version="1.0">
|
||||
<property name="configver" type="int" value="2"/>
|
||||
<property name="panels" type="array">
|
||||
<value type="int" value="1"/>
|
||||
<property name="dark-mode" type="bool" value="false"/>
|
||||
<property name="panel-1" type="empty">
|
||||
<property name="position" type="string" value="p=6;x=0;y=0"/>
|
||||
<property name="length" type="uint" value="100"/>
|
||||
<property name="position-locked" type="bool" value="true"/>
|
||||
<property name="icon-size" type="uint" value="16"/>
|
||||
<property name="size" type="uint" value="30"/>
|
||||
<property name="plugin-ids" type="array">
|
||||
<value type="int" value="1"/>
|
||||
<value type="int" value="2"/>
|
||||
<value type="int" value="3"/>
|
||||
<value type="int" value="4"/>
|
||||
</property>
|
||||
<property name="mode" type="uint" value="0"/>
|
||||
</property>
|
||||
</property>
|
||||
<property name="plugins" type="empty">
|
||||
<property name="plugin-1" type="string" value="applicationsmenu"/>
|
||||
<property name="plugin-2" type="string" value="tasklist">
|
||||
<property name="grouping" type="uint" value="1"/>
|
||||
</property>
|
||||
<property name="plugin-3" type="string" value="separator">
|
||||
<property name="expand" type="bool" value="true"/>
|
||||
<property name="style" type="uint" value="0"/>
|
||||
</property>
|
||||
<property name="plugin-4" type="string" value="pager">
|
||||
<property name="rows" type="uint" value="1"/>
|
||||
</property>
|
||||
<property name="plugin-9" type="string" value="power-manager-plugin"/>
|
||||
</property>
|
||||
</channel>
|
||||
@ -0,0 +1,91 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<channel name="xfwm4" version="1.0">
|
||||
<property name="general" type="empty">
|
||||
<property name="activate_action" type="string" value="bring"/>
|
||||
<property name="borderless_maximize" type="bool" value="true"/>
|
||||
<property name="box_move" type="bool" value="false"/>
|
||||
<property name="box_resize" type="bool" value="false"/>
|
||||
<property name="button_layout" type="string" value="O|SHMC"/>
|
||||
<property name="button_offset" type="int" value="0"/>
|
||||
<property name="button_spacing" type="int" value="0"/>
|
||||
<property name="click_to_focus" type="bool" value="true"/>
|
||||
<property name="cycle_apps_only" type="bool" value="false"/>
|
||||
<property name="cycle_draw_frame" type="bool" value="true"/>
|
||||
<property name="cycle_raise" type="bool" value="false"/>
|
||||
<property name="cycle_hidden" type="bool" value="true"/>
|
||||
<property name="cycle_minimum" type="bool" value="true"/>
|
||||
<property name="cycle_minimized" type="bool" value="false"/>
|
||||
<property name="cycle_preview" type="bool" value="true"/>
|
||||
<property name="cycle_tabwin_mode" type="int" value="0"/>
|
||||
<property name="cycle_workspaces" type="bool" value="false"/>
|
||||
<property name="double_click_action" type="string" value="maximize"/>
|
||||
<property name="double_click_distance" type="int" value="5"/>
|
||||
<property name="double_click_time" type="int" value="250"/>
|
||||
<property name="easy_click" type="string" value="Alt"/>
|
||||
<property name="focus_delay" type="int" value="250"/>
|
||||
<property name="focus_hint" type="bool" value="true"/>
|
||||
<property name="focus_new" type="bool" value="true"/>
|
||||
<property name="frame_opacity" type="int" value="100"/>
|
||||
<property name="frame_border_top" type="int" value="0"/>
|
||||
<property name="full_width_title" type="bool" value="true"/>
|
||||
<property name="horiz_scroll_opacity" type="bool" value="false"/>
|
||||
<property name="inactive_opacity" type="int" value="100"/>
|
||||
<property name="maximized_offset" type="int" value="0"/>
|
||||
<property name="mousewheel_rollup" type="bool" value="true"/>
|
||||
<property name="move_opacity" type="int" value="100"/>
|
||||
<property name="placement_mode" type="string" value="center"/>
|
||||
<property name="placement_ratio" type="int" value="20"/>
|
||||
<property name="popup_opacity" type="int" value="100"/>
|
||||
<property name="prevent_focus_stealing" type="bool" value="false"/>
|
||||
<property name="raise_delay" type="int" value="250"/>
|
||||
<property name="raise_on_click" type="bool" value="true"/>
|
||||
<property name="raise_on_focus" type="bool" value="false"/>
|
||||
<property name="raise_with_any_button" type="bool" value="true"/>
|
||||
<property name="repeat_urgent_blink" type="bool" value="false"/>
|
||||
<property name="resize_opacity" type="int" value="100"/>
|
||||
<property name="scroll_workspaces" type="bool" value="true"/>
|
||||
<property name="shadow_delta_height" type="int" value="0"/>
|
||||
<property name="shadow_delta_width" type="int" value="0"/>
|
||||
<property name="shadow_delta_x" type="int" value="0"/>
|
||||
<property name="shadow_delta_y" type="int" value="-3"/>
|
||||
<property name="shadow_opacity" type="int" value="50"/>
|
||||
<property name="show_app_icon" type="bool" value="false"/>
|
||||
<property name="show_dock_shadow" type="bool" value="true"/>
|
||||
<property name="show_frame_shadow" type="bool" value="true"/>
|
||||
<property name="show_popup_shadow" type="bool" value="false"/>
|
||||
<property name="snap_resist" type="bool" value="false"/>
|
||||
<property name="snap_to_border" type="bool" value="true"/>
|
||||
<property name="snap_to_windows" type="bool" value="false"/>
|
||||
<property name="snap_width" type="int" value="10"/>
|
||||
<property name="vblank_mode" type="string" value="auto"/>
|
||||
<property name="theme" type="string" value="Default"/>
|
||||
<property name="tile_on_move" type="bool" value="true"/>
|
||||
<property name="title_alignment" type="string" value="center"/>
|
||||
<property name="title_font" type="string" value="Sans Bold 9"/>
|
||||
<property name="title_horizontal_offset" type="int" value="0"/>
|
||||
<property name="titleless_maximize" type="bool" value="false"/>
|
||||
<property name="title_shadow_active" type="string" value="false"/>
|
||||
<property name="title_shadow_inactive" type="string" value="false"/>
|
||||
<property name="title_vertical_offset_active" type="int" value="0"/>
|
||||
<property name="title_vertical_offset_inactive" type="int" value="0"/>
|
||||
<property name="toggle_workspaces" type="bool" value="false"/>
|
||||
<property name="unredirect_overlays" type="bool" value="true"/>
|
||||
<property name="urgent_blink" type="bool" value="false"/>
|
||||
<property name="use_compositing" type="bool" value="false"/>
|
||||
<property name="workspace_count" type="int" value="4"/>
|
||||
<property name="wrap_cycle" type="bool" value="true"/>
|
||||
<property name="wrap_layout" type="bool" value="true"/>
|
||||
<property name="wrap_resistance" type="int" value="10"/>
|
||||
<property name="wrap_windows" type="bool" value="true"/>
|
||||
<property name="wrap_workspaces" type="bool" value="false"/>
|
||||
<property name="zoom_desktop" type="bool" value="true"/>
|
||||
<property name="zoom_pointer" type="bool" value="true"/>
|
||||
<property name="workspace_names" type="array">
|
||||
<value type="string" value="Workspace 1"/>
|
||||
<value type="string" value="Workspace 2"/>
|
||||
<value type="string" value="Workspace 3"/>
|
||||
<value type="string" value="Workspace 4"/>
|
||||
</property>
|
||||
</property>
|
||||
</channel>
|
||||
@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<channel name="xsettings" version="1.0">
|
||||
<property name="Xft" type="empty">
|
||||
<property name="DPI" type="int" value="96"/>
|
||||
<property name="Antialias" type="int" value="1"/>
|
||||
<property name="Hinting" type="int" value="1"/>
|
||||
<property name="HintStyle" type="string" value="hintslight"/>
|
||||
<property name="RGBA" type="string" value="rgb"/>
|
||||
</property>
|
||||
</channel>
|
||||
@ -44,6 +44,10 @@ elif [ "${DISTRO}" == "fedora40" ]; then
|
||||
dnf install -y curl git
|
||||
dnf localinstall -y --nogpgcheck https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-40.noarch.rpm
|
||||
dnf install -y --allowerasing ffmpeg pulseaudio pulseaudio-utils
|
||||
elif [ "${DISTRO}" == "fedora41" ]; then
|
||||
dnf install -y curl git
|
||||
dnf-3 localinstall -y --nogpgcheck https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-41.noarch.rpm
|
||||
dnf install -y --allowerasing ffmpeg pulseaudio pulseaudio-utils
|
||||
elif [ "${DISTRO}" == "opensuse" ]; then
|
||||
zypper install -ny curl git
|
||||
zypper install -yn ffmpeg pulseaudio-utils
|
||||
|
||||
@ -4,7 +4,7 @@ set -ex
|
||||
# Distro package cleanup
|
||||
if [[ "${DISTRO}" == @(centos|oracle7) ]] ; then
|
||||
yum clean all
|
||||
elif [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora37|fedora38|fedora39|fedora40|oracle8|oracle9|rhel9|rockylinux8|rockylinux9) ]]; then
|
||||
elif [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora37|fedora38|fedora39|fedora40|fedora41|oracle8|oracle9|rhel9|rockylinux8|rockylinux9) ]]; then
|
||||
dnf clean all
|
||||
elif [ "${DISTRO}" == "opensuse" ]; then
|
||||
zypper clean --all
|
||||
|
||||
@ -20,7 +20,7 @@ elif [[ "${DISTRO}" == "centos" ]]; then
|
||||
google-noto-emoji-fonts \
|
||||
google-noto-sans-cjk-fonts \
|
||||
google-noto-sans-fonts
|
||||
elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40) ]]; then
|
||||
elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40|fedora41) ]]; then
|
||||
dnf install -y \
|
||||
glibc-locale-source \
|
||||
google-noto-cjk-fonts \
|
||||
|
||||
@ -17,8 +17,8 @@ echo "Install KasmVNC server"
|
||||
cd /tmp
|
||||
BUILD_ARCH=$(uname -p)
|
||||
UBUNTU_CODENAME=""
|
||||
COMMIT_ID="e04731870baebd2784983fb48197a2416c7d3519"
|
||||
BRANCH="master" # just use 'release' for a release branch
|
||||
COMMIT_ID="e8f1787dc208909ea6756a70c821997351b537af"
|
||||
BRANCH="feature_KASM-6852-fedora-41" # just use 'release' for a release branch
|
||||
KASMVNC_VER="1.3.4"
|
||||
COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6)
|
||||
|
||||
@ -81,6 +81,12 @@ elif [[ "${DISTRO}" == "fedora40" ]] ; then
|
||||
else
|
||||
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_forty_${KASM_VER_NAME_PART}_aarch64.rpm"
|
||||
fi
|
||||
elif [[ "${DISTRO}" == "fedora41" ]] ; then
|
||||
if [[ "$(arch)" =~ ^x86_64$ ]] ; then
|
||||
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_fortyone_${KASM_VER_NAME_PART}_x86_64.rpm"
|
||||
else
|
||||
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_fortyone_${KASM_VER_NAME_PART}_aarch64.rpm"
|
||||
fi
|
||||
elif [[ "${DISTRO}" = @(debian|parrotos6) ]] ; then
|
||||
if $(grep -q bookworm /etc/os-release) || $(grep -q lory /etc/os-release); then
|
||||
if [[ "$(arch)" =~ ^x86_64$ ]] ; then
|
||||
@ -147,13 +153,19 @@ elif [[ "${DISTRO}" == @(oracle8|oracle9|rhel9|rockylinux9|rockylinux8|almalinux
|
||||
dnf localinstall -y kasmvncserver.rpm
|
||||
dnf install -y mesa-dri-drivers
|
||||
rm kasmvncserver.rpm
|
||||
elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40) ]] ; then
|
||||
elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40|fedora41) ]] ; then
|
||||
dnf install -y xorg-x11-drv-amdgpu xorg-x11-drv-ati
|
||||
if [ "${BUILD_ARCH}" == "x86_64" ]; then
|
||||
dnf install -y xorg-x11-drv-intel
|
||||
fi
|
||||
wget "${BUILD_URL}" -O kasmvncserver.rpm
|
||||
if [[ "${DISTRO}" == "fedora41" ]] ; then
|
||||
dnf-3 localinstall -y --allowerasing kasmvncserver.rpm
|
||||
dnf install -y update-crypto-policies
|
||||
update-crypto-policies --set FEDORA40
|
||||
else
|
||||
dnf localinstall -y --allowerasing kasmvncserver.rpm
|
||||
fi
|
||||
dnf install -y mesa-dri-drivers
|
||||
rm kasmvncserver.rpm
|
||||
elif [[ "${DISTRO}" == "opensuse" ]] ; then
|
||||
|
||||
@ -9,7 +9,7 @@ elif [[ "${DISTRO}" == "debian" ]] ; then
|
||||
sed -i \
|
||||
'/locale/d' \
|
||||
/etc/dpkg/dpkg.cfg.d/docker
|
||||
elif [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora37|fedora38|fedora39|fedora40|oracle8|oracle9|rhel9|rockylinux8|rockylinux9) ]]; then
|
||||
elif [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora37|fedora38|fedora39|fedora40|fedora41|oracle8|oracle9|rhel9|rockylinux8|rockylinux9) ]]; then
|
||||
rm -f /etc/rpm/macros.image-language-conf
|
||||
elif [[ "${DISTRO}" == @(centos|oracle7) ]]; then
|
||||
sed -i \
|
||||
@ -22,7 +22,7 @@ fi
|
||||
echo "Upgrading packages from upstream base image"
|
||||
if [[ "${DISTRO}" == @(centos|oracle7) ]] ; then
|
||||
yum update -y
|
||||
elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40|oracle8|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]]; then
|
||||
elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40|fedora41|oracle8|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]]; then
|
||||
dnf upgrade -y --refresh
|
||||
elif [ "${DISTRO}" == "opensuse" ]; then
|
||||
zypper --non-interactive patch --auto-agree-with-licenses
|
||||
|
||||
@ -6,7 +6,7 @@ echo $DISTRO
|
||||
|
||||
if [ "${DISTRO}" == "oracle7" ] || [ "${DISTRO}" == "centos" ]; then
|
||||
yum install -y cups cups-client cups-pdf
|
||||
elif [[ "${DISTRO}" == @(almalinux8|almalinux9|oracle8|oracle9|rhel9|rockylinux8|rockylinux9|fedora37|fedora38|fedora39|fedora40) ]]; then
|
||||
elif [[ "${DISTRO}" == @(almalinux8|almalinux9|oracle8|oracle9|rhel9|rockylinux8|rockylinux9|fedora37|fedora38|fedora39|fedora40|fedora41) ]]; then
|
||||
dnf install -y cups cups-client cups-pdf
|
||||
elif [ "${DISTRO}" == "opensuse" ]; then
|
||||
zypper install -y cups cups-client cups-pdf
|
||||
|
||||
@ -88,8 +88,8 @@ download_and_symlink() {
|
||||
}
|
||||
|
||||
ARCH=$(arch)
|
||||
BRANCH="develop"
|
||||
COMMIT_ID="9b62027aaf2046454b572d7257070aaac9cd8cac"
|
||||
BRANCH="feature_KASM-6852-fedora-41"
|
||||
COMMIT_ID="6bf95129c750a2453e65596020df2e593d58d06c"
|
||||
|
||||
convert_local_distro_to_profile_sync_distro
|
||||
check_distro_is_supported
|
||||
|
||||
@ -3,7 +3,7 @@ set -ex
|
||||
|
||||
# Install openssl
|
||||
ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
|
||||
if [[ "${DISTRO}" == @(centos|oracle7|oracle8|oracle9|rhel9|fedora37|fedora38|fedora39|fedora40|almalinux8|almalinux9|rockylinux8|rockylinux9) ]]; then
|
||||
if [[ "${DISTRO}" == @(centos|oracle7|oracle8|oracle9|rhel9|fedora37|fedora38|fedora39|fedora40|fedora41|almalinux8|almalinux9|rockylinux8|rockylinux9) ]]; then
|
||||
dnf install -y openssl xkbcomp
|
||||
rm -f /etc/X11/xinit/xinitrc
|
||||
elif [[ "${DISTRO}" == "alpine" ]]; then
|
||||
@ -26,7 +26,7 @@ else
|
||||
fi
|
||||
|
||||
# Update squid conf with user info
|
||||
if [[ "${DISTRO}" == @(centos|oracle7|oracle8|oracle9|rhel9|fedora37|fedora38|fedora39|fedora40|almalinux8|almalinux9|rockylinux8|rockylinux9|alpine) ]]; then
|
||||
if [[ "${DISTRO}" == @(centos|oracle7|oracle8|oracle9|rhel9|fedora37|fedora38|fedora39|fedora40|fedora41|almalinux8|almalinux9|rockylinux8|rockylinux9|alpine) ]]; then
|
||||
useradd --system --shell /usr/sbin/nologin --home-dir /bin proxy
|
||||
elif [ "${DISTRO}" == "opensuse" ]; then
|
||||
useradd --system --shell /usr/sbin/nologin --home-dir /bin proxy
|
||||
@ -53,7 +53,7 @@ chown -R proxy:proxy /etc/squid/blocked.acl
|
||||
|
||||
if [[ "${DISTRO}" == @(centos|oracle7) ]]; then
|
||||
yum install -y memcached cyrus-sasl iproute
|
||||
elif [[ "${DISTRO}" == @(oracle8|fedora37|fedora38|fedora39|fedora40|oracle9|rhel9|rockylinux9|rockylinux8|almalinux9|almalinux8) ]]; then
|
||||
elif [[ "${DISTRO}" == @(oracle8|fedora37|fedora38|fedora39|fedora40|fedora41|oracle9|rhel9|rockylinux9|rockylinux8|almalinux9|almalinux8) ]]; then
|
||||
dnf install -y memcached cyrus-sasl iproute
|
||||
elif [ "${DISTRO}" == "opensuse" ]; then
|
||||
zypper install -yn memcached cyrus-sasl iproute2 libatomic1
|
||||
@ -92,7 +92,7 @@ chmod +x /etc/squid/kasm_squid_adapter
|
||||
# Install Cert utilities
|
||||
if [[ "${DISTRO}" == @(centos|oracle7) ]]; then
|
||||
yum install -y nss-tools
|
||||
elif [[ "${DISTRO}" == @(oracle8|fedora37|fedora38|fedora39|fedora40|oracle9|rhel9|rockylinux9|rockylinux8|almalinux9|almalinux8) ]]; then
|
||||
elif [[ "${DISTRO}" == @(oracle8|fedora37|fedora38|fedora39|fedora40|fedora41|oracle9|rhel9|rockylinux9|rockylinux8|almalinux9|almalinux8) ]]; then
|
||||
dnf install -y nss-tools
|
||||
elif [ "${DISTRO}" == "opensuse" ]; then
|
||||
zypper install -yn mozilla-nss-tools
|
||||
|
||||
@ -15,7 +15,7 @@ if [[ "${DISTRO}" == @(ubuntu|debian|parrotos6|kali) ]] ; then
|
||||
systemd \
|
||||
systemd-sysv \
|
||||
udev
|
||||
elif [[ "${DISTRO}" == @(oracle8|oracle9|rhel9|rockylinux9|rockylinux8|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
|
||||
elif [[ "${DISTRO}" == @(oracle8|oracle9|rhel9|rockylinux9|rockylinux8|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40|fedora41) ]]; then
|
||||
# Install deps
|
||||
dnf install -y \
|
||||
dbus \
|
||||
|
||||
@ -8,7 +8,7 @@ fi
|
||||
echo "Install some common tools for further installation"
|
||||
if [[ "${DISTRO}" == @(centos|oracle7) ]] ; then
|
||||
yum install -y vim wget net-tools bzip2 ca-certificates bc
|
||||
elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40|oracle8|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]]; then
|
||||
elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40|fedora41|oracle8|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]]; then
|
||||
dnf install -y wget net-tools bzip2 tar vim hostname procps-ng bc
|
||||
elif [ "${DISTRO}" == "opensuse" ]; then
|
||||
zypper install -yn wget net-tools bzip2 tar vim gzip iputils bc
|
||||
|
||||
@ -30,7 +30,7 @@ EOL
|
||||
}
|
||||
|
||||
echo "Install Xfce4 UI components"
|
||||
if [[ "${DISTRO}" != @(centos|oracle7|oracle8|opensuse|fedora37|fedora38|fedora39|fedora40|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then
|
||||
if [[ "${DISTRO}" != @(centos|oracle7|oracle8|opensuse|fedora37|fedora38|fedora39|fedora40|fedora41|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then
|
||||
apt-get update
|
||||
fi
|
||||
|
||||
@ -174,14 +174,29 @@ elif [ "$DISTRO" = "opensuse" ]; then
|
||||
xset
|
||||
# Pidof is no longer shipped in OpenSuse
|
||||
ln -s /usr/bin/pgrep /usr/bin/pidof
|
||||
elif [[ "$DISTRO" = @(fedora37|fedora38|fedora39|fedora40) ]]; then
|
||||
dnf group install xfce -y
|
||||
elif [[ "$DISTRO" = @(fedora37|fedora38|fedora39|fedora40|fedora41) ]]; then
|
||||
dnf install -y \
|
||||
gvfs \
|
||||
wmctrl \
|
||||
xclip \
|
||||
xfce4-notifyd \
|
||||
xset
|
||||
dbus-tools \
|
||||
dbus-x11 \
|
||||
desktop-backgrounds-compat \
|
||||
dex-autostart \
|
||||
greybird-dark-theme \
|
||||
greybird-xfwm4-theme \
|
||||
gtk-xfce-engine \
|
||||
mousepad \
|
||||
Thunar \
|
||||
xfce4-appfinder \
|
||||
xfce4-datetime-plugin \
|
||||
xfce4-panel \
|
||||
xfce4-places-plugin \
|
||||
xfce4-pulseaudio-plugin \
|
||||
xfce4-session \
|
||||
xfce4-settings \
|
||||
xfce4-terminal \
|
||||
xfconf \
|
||||
xfdesktop \
|
||||
xfwm4 \
|
||||
xfwm4-themes
|
||||
|
||||
# fix for xfce4-notifyd not being rachable
|
||||
dbus-uuidgen --ensure
|
||||
@ -216,7 +231,7 @@ Exec=/usr/lib/xfce4/notifyd/xfce4-notifyd
|
||||
EOL
|
||||
fi
|
||||
|
||||
if [[ "${DISTRO}" != @(centos|oracle7|oracle8|fedora37|fedora38|fedora39|fedora40|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then
|
||||
if [[ "${DISTRO}" != @(centos|oracle7|oracle8|fedora37|fedora38|fedora39|fedora40|fedora41|oracle9|rhel9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then
|
||||
replace_default_xinit
|
||||
if [ "${START_XFCE4}" == "1" ] ; then
|
||||
replace_default_99x11_common_start
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user