added the latest from upstream to fix conflict
This commit is contained in:
parent
1877b09f79
commit
94a0b1cb2e
1 changed files with 2 additions and 2 deletions
|
@ -5,10 +5,10 @@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
stamp="$COSMOS_BASE/stamps/common-tools-v02.stamp"
|
stamp="$COSMOS_BASE/stamps/common-tools-v01.stamp"
|
||||||
|
|
||||||
if ! test -f $stamp; then
|
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
|
update-alternatives --set editor /usr/bin/vim.basic
|
||||||
|
|
||||||
mkdir -p `dirname $stamp`
|
mkdir -p `dirname $stamp`
|
||||||
|
|
Loading…
Add table
Reference in a new issue