From 44ad630db77d36de869bcab132e55f467b258990 Mon Sep 17 00:00:00 2001 From: Fabio Rehm Date: Fri, 21 Mar 2014 19:27:13 -0300 Subject: [PATCH] boxes: Remove redundant `lxc` from intermediate container names --- boxes/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boxes/Makefile b/boxes/Makefile index 5bc16c9..f67a33c 100644 --- a/boxes/Makefile +++ b/boxes/Makefile @@ -10,14 +10,14 @@ ubuntu: $(UBUNTU_BOXES) debian: $(DEBIAN_BOXES) # REFACTOR: Figure out how can we reduce duplicated code -$(UBUNTU_BOXES): CONTAINER = "vagrant-lxc-base-${@}-amd64" +$(UBUNTU_BOXES): CONTAINER = "vagrant-base-${@}-amd64" $(UBUNTU_BOXES): PACKAGE = "output/${TODAY}/vagrant-lxc-${@}-amd64.box" $(UBUNTU_BOXES): @mkdir -p $$(dirname $(PACKAGE)) @sudo -E ./mk-debian.sh ubuntu $(@) amd64 $(CONTAINER) $(PACKAGE) @sudo chmod +rw $(PACKAGE) @sudo chown ${USER}: $(PACKAGE) -$(DEBIAN_BOXES): CONTAINER = "vagrant-lxc-base-${@}-amd64" +$(DEBIAN_BOXES): CONTAINER = "vagrant-base-${@}-amd64" $(DEBIAN_BOXES): PACKAGE = "output/${TODAY}/vagrant-lxc-${@}-amd64.box" $(DEBIAN_BOXES): @mkdir -p $$(dirname $(PACKAGE)) @@ -37,6 +37,6 @@ clean: ALL_BOXES = ${DEBIAN_BOXES} ${UBUNTU_BOXES} acceptance clean: @for r in $(ALL_BOXES); do \ sudo -E ./clean.sh $${r}\ - vagrant-lxc-base-$${r}-amd64 \ + vagrant-base-$${r}-amd64 \ output/${TODAY}/vagrant-lxc-$${r}-amd64.box; \ done