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

Merge branch 'bugfix/KASM-6627-ignore_installing_software_properties_for_kali_rolling_1.15.0' into 'release/1.15.0'

Browse Source 
Ignored installing software-properties-common for kali-rolling in release/1.15.0

See merge request kasm-technologies/internal/workspaces-core-images!237
This commit is contained in:
Justin Travis 2024-11-05 16:55:34 +00:00
commit c458aeb2e2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ubuntu/install/tools/install_tools.sh
View File

@ -33,7 +33,13 @@ else
apt-get update apt-get update
# Update tzdata noninteractive (otherwise our script is hung on user input later). # Update tzdata noninteractive (otherwise our script is hung on user input later).
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
apt-get install ${PARROTEXTRA} -y vim wget net-tools locales bzip2 wmctrl software-properties-common mesa-utils bc
# software-properties is removed from kali-rolling
if grep -q "kali-rolling" /etc/os-release; then
apt-get install ${PARROTEXTRA} -y vim wget net-tools locales bzip2 wmctrl mesa-utils bc
else
apt-get install ${PARROTEXTRA} -y vim wget net-tools locales bzip2 wmctrl software-properties-common mesa-utils bc
fi
echo "generate locales for en_US.UTF-8" echo "generate locales for en_US.UTF-8"
locale-gen en_US.UTF-8 locale-gen en_US.UTF-8