From a5172d418360bc96be639bad0b597d6e62bfc7fb Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 13 Feb 2018 14:40:59 +0100
Subject: Makefile: quote ROOTPW variable when generating/validating its hash

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 95948e6..9a10a18 100644
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,7 @@ endif
 HASHER := sha256sum
 check_rootpw = $(if $(strip $(ROOTPW)),\
     $(if $1,\
-        $(if $(shell echo $(ROOTPW) | $(HASHER) --check --quiet $1/base/rootpw.$(HASHER)),\
+        $(if $(shell echo "$(ROOTPW)" | $(HASHER) --check --quiet $1/base/rootpw.$(HASHER)),\
              $(error ROOTPW password hash does not match $1/base/rootpw.$(HASHER)),\
              ),\
         ),\
@@ -94,7 +94,7 @@ $(BASETARGETS):
 		-var='vm_name=rootfs-image' \
 		-var='output_directory=$(@D)/base' \
 		$(@D).json
-	@echo $(ROOTPW) | $(HASHER) > $(@D)/base/rootpw.$(HASHER)
+	@echo "$(ROOTPW)" | $(HASHER) > $(@D)/base/rootpw.$(HASHER)
 
 
 # Provisioning images
-- 
cgit v1.2.3-55-g7522