From c60a77f9a6a983ef4c288013608afb3467453acd Mon Sep 17 00:00:00 2001
From: Nathan Gardiner <ngardiner@gmail.com>
Date: Fri, 17 Feb 2017 23:50:20 -0500
Subject: [PATCH] Build improvements

---
 .gitignore                | 4 +---
 Makefile.global           | 2 +-
 ansible/.gitignore        | 4 +---
 ansible/README.md         | 5 +++++
 jessie_minimal/.gitignore | 4 +---
 jessie_minimal/README.md  | 4 ++--
 6 files changed, 11 insertions(+), 12 deletions(-)
 create mode 100644 ansible/README.md

diff --git a/.gitignore b/.gitignore
index 6047fcf..b338d88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
 .veid
-=======
->>>>>>> cdeb30b537af4d02d82b35fd997e82cc88bd1f24
 cache
+testing
diff --git a/Makefile.global b/Makefile.global
index 1be64be..303d2b2 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -44,7 +44,7 @@ sshkey:
 ifneq ($(strip $(SSH_KEY)),)
 	mkdir -p $(BASEDIR)/root/.ssh
 	echo $(SSH_KEY) >> $(BASEDIR)/root/.ssh/authorized_keys.tmp
-	cat $(BASEDIR)/root/.ssh/authorized_keys.tmp | sed 's/^ //g' | sed 's/^$$//g' > $(BASEDIR)/root/.ssh/authorized_keys
+	cat $(BASEDIR)/root/.ssh/authorized_keys.tmp | sed 's/^ //g' | egrep -v ^$$ > $(BASEDIR)/root/.ssh/authorized_keys
 	rm -f $(BASEDIR)/root/.ssh/authorized_keys.tmp
 endif
 
diff --git a/ansible/.gitignore b/ansible/.gitignore
index 8e0a5bb..bb0cb9e 100644
--- a/ansible/.gitignore
+++ b/ansible/.gitignore
@@ -1,8 +1,6 @@
-<<<<<<< HEAD
 .veid
-=======
->>>>>>> cdeb30b537af4d02d82b35fd997e82cc88bd1f24
 config
 info
 logfile
 rootfs
+ubuntu-16.04-ansible_16.04-1_amd64.tar.gz
diff --git a/ansible/README.md b/ansible/README.md
new file mode 100644
index 0000000..98dfeb9
--- /dev/null
+++ b/ansible/README.md
@@ -0,0 +1,5 @@
+# Ansible
+
+- Adds any customizations such as root login enabled or SSH keys from ../Makefile.global
+- Total uncompressed image size is *640 MB*
+- Total compressed image size is *206 MB*
diff --git a/jessie_minimal/.gitignore b/jessie_minimal/.gitignore
index 8e0a5bb..1e693e7 100644
--- a/jessie_minimal/.gitignore
+++ b/jessie_minimal/.gitignore
@@ -1,8 +1,6 @@
-<<<<<<< HEAD
 .veid
-=======
->>>>>>> cdeb30b537af4d02d82b35fd997e82cc88bd1f24
 config
 info
 logfile
 rootfs
+debian-8.0-minimal_8.5-1_amd64.tar.gz
diff --git a/jessie_minimal/README.md b/jessie_minimal/README.md
index 4b87d80..bd8832c 100644
--- a/jessie_minimal/README.md
+++ b/jessie_minimal/README.md
@@ -3,5 +3,5 @@
 - Built from a minimal debootstrap install of Debian Jessie
 - Contains additional important packages such as an NTP Client and CA Certificates
 - Adds any customizations such as root login enabled or SSH keys from ../Makefile.global
-- Total uncompressed image size is *371 MB*
-- Total compressed image size is *132 MB*
+- Total uncompressed image size is *347 MB*
+- Total compressed image size is *120 MB*