From 495c7ea0628697a6ce0bf7aaa5cc749861c662a4 Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Sun, 3 Jun 2018 17:23:05 +0800 Subject: [PATCH] Replace invocations to apt with apt-get (Closes: subutai-io/vagrant#103) --- provisioning/en/provisioner.sh | 2 +- scripts/ubuntu/zfs.sh | 4 ++-- scripts/zfs.sh | 4 ++-- stretch/hyperv/provisioner.jsonnet | 6 +++--- xenial/hyperv/provisioner.jsonnet | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/provisioning/en/provisioner.sh b/provisioning/en/provisioner.sh index 0814458..d8582cd 100644 --- a/provisioning/en/provisioner.sh +++ b/provisioning/en/provisioner.sh @@ -70,7 +70,7 @@ else echo "Installing $CMD ..." echo >> /etc/apt/sources.list echo "deb http://deb.subutai.io/subutai $ENV main" | tee --append /etc/apt/sources.list - apt update && apt -y install subutai + apt-get update && apt-get -y install subutai cmd_path="$(which $CMD)" fi diff --git a/scripts/ubuntu/zfs.sh b/scripts/ubuntu/zfs.sh index 088ed95..cb482e1 100644 --- a/scripts/ubuntu/zfs.sh +++ b/scripts/ubuntu/zfs.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -apt -y install zfsutils-linux +apt-get -y install zfsutils-linux /sbin/modprobe zfs @@ -10,7 +10,7 @@ zfs create -o mountpoint="/var/lib/lxc" subutai/fs zpool set autoexpand=on subutai -apt -y install lxc +apt-get -y install lxc apt-get -y install dirmngr diff --git a/scripts/zfs.sh b/scripts/zfs.sh index 5c567e5..eaea5a1 100644 --- a/scripts/zfs.sh +++ b/scripts/zfs.sh @@ -1,6 +1,6 @@ #!/bin/bash -apt -y install zfsutils +apt-get -y install zfsutils /sbin/modprobe zfs @@ -10,7 +10,7 @@ zfs create -o mountpoint="/var/lib/lxc" subutai/fs zpool set autoexpand=on subutai -apt -y install lxc +apt-get -y install lxc apt-get -y install dirmngr diff --git a/stretch/hyperv/provisioner.jsonnet b/stretch/hyperv/provisioner.jsonnet index 65b7e5c..7f4e421 100644 --- a/stretch/hyperv/provisioner.jsonnet +++ b/stretch/hyperv/provisioner.jsonnet @@ -19,13 +19,13 @@ "cp /tmp/sources.list /etc/apt/sources.list", "apt-get update", "sed -i '1 i\\ulimit -n 65535' /etc/profile", - "apt -y install zfsutils", + "apt-get -y install zfsutils", "/sbin/modprobe zfs", "zpool create -f subutai /dev/mapper/main-zfs", "zfs create -o mountpoint=\"/var/lib/lxc\" subutai/fs", "zpool set autoexpand=on subutai", - "apt -y install lxc", + "apt-get -y install lxc", "apt-get -y install dirmngr", "apt-key adv --recv-keys --keyserver keyserver.ubuntu.com C6B2AC7FBEB649F1" ] - } \ No newline at end of file + } diff --git a/xenial/hyperv/provisioner.jsonnet b/xenial/hyperv/provisioner.jsonnet index 24d0ef0..823fec0 100644 --- a/xenial/hyperv/provisioner.jsonnet +++ b/xenial/hyperv/provisioner.jsonnet @@ -21,13 +21,13 @@ "cp /tmp/sources.list /etc/apt/sources.list", "apt-get update", "sed -i '1 i\\ulimit -n 65535' /etc/profile", - "apt -y install zfsutils-linux", + "apt-get -y install zfsutils-linux", "/sbin/modprobe zfs", "zpool create -f subutai /dev/mapper/main-zfs", "zfs create -o mountpoint=\"/var/lib/lxc\" subutai/fs", "zpool set autoexpand=on subutai", - "apt -y install lxc", + "apt-get -y install lxc", "apt-get -y install dirmngr", "apt-key adv --recv-keys --keyserver keyserver.ubuntu.com C6B2AC7FBEB649F1" ] - } \ No newline at end of file + }