Fix systemd unit files

aws/image/Makefile

@@ -50,12 +50,14 @@ UMOCI_REPO  = https://github.com/opencontainers/umoci
 build: $(IMAGE_FILE)
 
 $(IMAGE_FILE): $(BINARIES) $(FILES)
+	mkdir -p toupload
 	packer build -var vpc_id=${VPC_ID} \
 		-var subnet_id=${SUBNET_ID} \
 		-var account_id=${ACCOUNT_ID} \
 		-var region=${REGION} \
 		-var instance_type=${INSTANCE_TYPE} \
 		-var ami_name=peer-pods-ami-${UUID} . 
+	rm -fr toupload
 
 $(AGENT_PROTOCOL_FORWARDER): force
 	cd "$(AGENT_PROTOCOL_FORWARDER_SRC)" && $(MAKE) agent-protocol-forwarder

aws/image/aws-ubuntu.pkr.hcl

@@ -32,12 +32,23 @@ build {
   sources = [
     "source.amazon-ebs.ubuntu"
   ]
+
+  provisioner "shell-local" {
+    command = "tar cf toupload/files.tar files"
+  }
 
   provisioner "file" {
-    source      = "./files"
+    source      = "./toupload"
     destination = "/tmp/"
   }
 
+  provisioner "shell" {
+    inline = [
+      "cd /tmp && tar xf toupload/files.tar",
+      "rm toupload/files.tar"
+    ]
+  }
+
   provisioner "file" {
     source      = "copy-files.sh"
     destination = "~/copy-files.sh"

aws/image/copy-files.sh

@@ -1,8 +1,7 @@
 sudo mkdir -p /etc/containers
-sudo cp -r /tmp/files/etc/containers/* /etc/containers/
-sudo cp -r /tmp/files/etc/systemd/* /etc/systemd/
+sudo cp -a /tmp/files/etc/containers/* /etc/containers/
+sudo cp -a /tmp/files/etc/systemd/* /etc/systemd/
 
 
 sudo mkdir -p /usr/local/bin
-sudo cp -r /tmp/files/usr/* /usr/
-
+sudo cp -a /tmp/files/usr/* /usr/