tell envsubst which variables to expand (#132)

fixes #126
canonical · Sep 6, 2023 · 417f127 · 417f127
1 parent 1cc01e2
commit 417f127
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/centos6/Makefile b/centos6/Makefile
@@ -15,7 +15,7 @@ centos6.tar.gz: check-deps clean http/centos6.ks
 	${SUDO} ${PACKER} init centos6.pkr.hcl && ${SUDO} ${PACKER} build centos6.pkr.hcl
 
 http/centos6.ks: http/centos6.ks.in
-	envsubst < $< | tee $@
+	envsubst '$KS_PROXY' < $< | tee $@
 
 clean:
 	${SUDO} ${RM} -rf output-centos6 centos6.tar.gz http/centos6.ks
diff --git a/centos7/Makefile b/centos7/Makefile
@@ -15,7 +15,7 @@ centos7.tar.gz: clean check-deps http/centos7.ks
 	${SUDO} ${PACKER} init centos7.pkr.hcl && ${SUDO} ${PACKER} build centos7.pkr.hcl
 
 http/centos7.ks: http/centos7.ks.in
-	envsubst < $< | tee $@
+	envsubst '$KS_PROXY' < $< | tee $@
 
 clean:
 	${SUDO} ${RM} -rf output-centos7 centos7.tar.gz http/centos7.ks
diff --git a/centos8-stream/Makefile b/centos8-stream/Makefile
@@ -15,7 +15,7 @@ centos8-stream.tar.gz: check-deps clean http/centos8-stream.ks
 	${SUDO} ${PACKER} init centos8-stream.pkr.hcl && ${SUDO} ${PACKER} build centos8-stream.pkr.hcl
 
 http/centos8-stream.ks: http/centos8-stream.ks.in
-	envsubst < $< | tee $@
+	envsubst '$KS_PROXY' < $< | tee $@
 
 clean:
 	${SUDO} ${RM} -rf output-centos8-stream centos8-stream.tar.gz http/centos8-stream.ks
diff --git a/centos8/Makefile b/centos8/Makefile
@@ -15,7 +15,7 @@ centos8.tar.gz: check-deps clean http/centos8.ks
 	${SUDO} ${PACKER} init centos8.pkr.hcl && ${PACKER} build centos8.pkr.hcl
 
 http/centos8.ks: http/centos8.ks.in
-	envsubst < $< | tee $@
+	envsubst '$KS_PROXY' < $< | tee $@
 
 clean:
 	${SUDO} ${RM} -rf output-centos8 centos8.tar.gz http/centos8.ks
diff --git a/rhel7/Makefile b/rhel7/Makefile
@@ -16,7 +16,7 @@ rhel7.tar.gz: check-deps clean http/rhel7.ks
 	${SUDO} ${PACKER} init rhel7.pkr.hcl && ${SUDO} ${PACKER} build -var "rhel7_iso_path=${ISO}" rhel7.pkr.hcl
 
 http/rhel7.ks: http/rhel7.ks.in
-	envsubst < $< | tee $@
+	envsubst '$KS_PROXY' < $< | tee $@
 
 clean:
 	${SUDO} ${RM} -rf output-rhel7 rhel7.tar.gz http/rhel7.ks
diff --git a/rhel8/Makefile b/rhel8/Makefile
@@ -16,7 +16,7 @@ rhel8.tar.gz: check-deps clean http/rhel8.ks
 	${SUDO} ${PACKER} init rhel8.pkr.hcl && ${SUDO} ${PACKER} build -var "rhel8_iso_path=${ISO}" rhel8.pkr.hcl
 
 http/rhel8.ks: http/rhel8.ks.in
-	envsubst < $< | tee $@
+	envsubst '$KS_PROXY' < $< | tee $@
 
 clean:
 	${SUDO} ${RM} -rf output-rhel8 rhel8.tar.gz http/rhel8.ks
diff --git a/rhel9/Makefile b/rhel9/Makefile
@@ -16,7 +16,7 @@ rhel9.tar.gz: check-deps clean http/rhel9.ks
 	${SUDO} ${PACKER} init rhel9.pkr.hcl && ${SUDO} ${PACKER} build -var "rhel9_iso_path=${ISO}" rhel9.pkr.hcl
 
 http/rhel9.ks: http/rhel9.ks.in
-	envsubst < $< | tee $@
+	envsubst '$KS_PROXY' < $< | tee $@
 
 clean:
 	${SUDO} ${RM} -rf output-rhel9 rhel9.tar.gz http/rhel9.ks
diff --git a/rocky8/Makefile b/rocky8/Makefile
@@ -15,7 +15,7 @@ rocky8.tar.gz: check-deps clean http/rocky.ks
 	${SUDO} ${PACKER} init rocky8.pkr.hcl && ${SUDO} ${PACKER} build rocky8.pkr.hcl
 
 http/rocky.ks: http/rocky.ks.in
-	envsubst < $< | tee $@
+	envsubst '$KS_PROXY' < $< | tee $@
 
 clean:
 	${SUDO} ${RM} -rf output-rocky8 rocky8.tar.gz http/rocky.ks
diff --git a/rocky9/Makefile b/rocky9/Makefile
@@ -15,7 +15,7 @@ rocky9.tar.gz: check-deps clean http/rocky.ks
 	${SUDO} ${PACKER} init rocky9.pkr.hcl && ${SUDO} ${PACKER} build rocky9.pkr.hcl
 
 http/rocky.ks: http/rocky.ks.in
-	envsubst < $< | tee $@
+	envsubst '$KS_PROXY' < $< | tee $@
 
 clean:
 	${SUDO} ${RM} -rf output-rocky9 rocky9.tar.gz http/rocky.ks