From 94a0b1cb2e2072b36693cb7e52e6c28809c21a41 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Wed, 29 Jan 2025 10:18:48 +0100 Subject: [PATCH] added the latest from upstream to fix conflict --- global/pre-tasks.d/020common-tools | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global/pre-tasks.d/020common-tools b/global/pre-tasks.d/020common-tools index 563fab2b..aece6464 100755 --- a/global/pre-tasks.d/020common-tools +++ b/global/pre-tasks.d/020common-tools @@ -5,10 +5,10 @@ set -e -stamp="$COSMOS_BASE/stamps/common-tools-v02.stamp" +stamp="$COSMOS_BASE/stamps/common-tools-v01.stamp" if ! test -f $stamp; then - apt-get -y update && apt-get -y upgrade && apt-get -y install vim traceroute tcpdump molly-guard less rsync git-core unattended-upgrades ntp wget + apt-get -y install vim traceroute tcpdump molly-guard less rsync git-core unattended-upgrades update-alternatives --set editor /usr/bin/vim.basic mkdir -p `dirname $stamp`