mirror of
https://github.com/kasmtech/workspaces-core-images.git
synced 2024-11-07 08:04:06 +01:00
Merge branch 'bugfix/KASM-6627-ignore_installing_software_properties_for_kali_rolling_1.16.0' into 'release/1.16.0'
Ignored installing software-properties-common for kali-rolling in release/1.16.0 See merge request kasm-technologies/internal/workspaces-core-images!235
This commit is contained in:
commit
75eb876100
@ -34,7 +34,13 @@ else
|
||||
apt-get update
|
||||
# Update tzdata noninteractive (otherwise our script is hung on user input later).
|
||||
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
|
||||
|
||||
# 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"
|
||||
locale-gen en_US.UTF-8
|
||||
|
Loading…
Reference in New Issue
Block a user