summaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-12-15 21:24:00 +0000
committerintrigeri <intrigeri@boum.org>2018-12-15 23:52:57 +0000
commita0d50375316e03aee36dbbcdc7ae90ae5046b379 (patch)
treec3973db2b77ad7b58a35f8d7ce8235f0307ac8dd /vagrant
parent6a5eefca9486f7d89361b7aed4ac0d1547bc94e3 (diff)
Vagrant postinstall.sh: make output formatting consistent.
Diffstat (limited to 'vagrant')
-rwxr-xr-xvagrant/definitions/tails-builder/postinstall.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/vagrant/definitions/tails-builder/postinstall.sh b/vagrant/definitions/tails-builder/postinstall.sh
index 50e8a07..a97eda4 100755
--- a/vagrant/definitions/tails-builder/postinstall.sh
+++ b/vagrant/definitions/tails-builder/postinstall.sh
@@ -9,12 +9,12 @@ echo "$(date)" > /var/lib/vagrant_box_build_time
export DEBIAN_FRONTEND="noninteractive"
-echo "I: Add sudo permissions to user vagrant..."
+echo "I: Adding sudo permissions to user vagrant..."
cat > /etc/sudoers.d/vagrant << EOF
vagrant ALL=(ALL) NOPASSWD: ALL
EOF
-echo "I: Add pubkey for vagrant..."
+echo "I: Adding pubkey for vagrant..."
mkdir -p /home/vagrant/.ssh
cat > /home/vagrant/.ssh/authorized_keys << EOF
ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
@@ -31,10 +31,10 @@ cat > /etc/apt/apt.conf.d/99retries << EOF
APT::Acquire::Retries "20";
EOF
-echo "I: Install Tails APT repo signing key."
+echo "I: Installing Tails APT repo signing key..."
apt-key add /tmp/tails.binary.gpg
-echo "I: Add standard APT suites."
+echo "I: Adding standard APT suites..."
cat "/etc/apt/sources.list" | \
sed -e 's/stretch/stretch-updates/' \
> "/etc/apt/sources.list.d/stretch-updates.list"
@@ -42,7 +42,7 @@ cat "/etc/apt/sources.list" | \
echo "deb http://time-based.snapshots.deb.tails.boum.org/debian-security/${DEBIAN_SECURITY_SERIAL}/ stretch/updates main" \
> "/etc/apt/sources.list.d/stretch-security.list"
-echo "I: Adding our builder-jessie suite with live-build, pin it low."
+echo "I: Adding our builder-jessie suite with live-build and pinning it low..."
echo "deb http://time-based.snapshots.deb.tails.boum.org/tails/${TAILS_SERIAL}/ builder-jessie main" > "/etc/apt/sources.list.d/tails.list"
sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/tails <<EOF
Package: *
@@ -86,7 +86,7 @@ apt-get -y install ca-certificates curl grub2 openssh-server wget
echo "I: Configuring GRUB..."
sed -i 's,^GRUB_TIMEOUT=5,GRUB_TIMEOUT=1,g' /etc/default/grub
-echo "I: Installing Tails build dependencies."
+echo "I: Installing Tails build dependencies..."
apt-get -y install \
debootstrap \
dosfstools \