wip

canonical · Feb 22, 2024 · fd52295 · fd52295
1 parent b354b73
commit fd52295
Show file tree

Hide file tree

Showing 19 changed files with 17 additions and 19 deletions.
diff --git a/ol8/Makefile b/ol8/Makefile
@@ -5,7 +5,7 @@ include ../scripts/check.mk
 PACKER ?= packer
 PACKER_LOG ?= 0
 
-export PACKER_LOG KS_PROXY
+export PACKER_LOG
 
 .PHONY: all clean
 
@@ -22,4 +22,4 @@ http/ol8.ks: http/ol8.ks.in
 clean:
 	${RM} -rf output-ol8 ol8.tar.gz http/ol8.ks
 
-.INTERMEDIATE: http/ol8.ks
+
diff --git a/ol8/README.md b/ol8/README.md
@@ -30,7 +30,7 @@ To use a proxy during the installation define the `KS_PROXY` variable in the
 environment, as bellow:
 
 ```shell
-export KS_PROXY="--proxy=\"${HTTP_PROXY}\""
+export KS_PROXY=$HTTP_PROXY
 ```
 
 ## Building an image

diff --git a/ol8/http/ol8.ks.in → ol8/http/ol8.ks.pkrtpl.hcl b/ol8/http/ol8.ks.in → ol8/http/ol8.ks.pkrtpl.hcl
diff --git a/ol9/Makefile b/ol9/Makefile
@@ -5,7 +5,7 @@ include ../scripts/check.mk
 PACKER ?= packer
 PACKER_LOG ?= 0
 
-export PACKER_LOG KS_PROXY
+export PACKER_LOG
 
 .PHONY: all clean
 
@@ -22,4 +22,4 @@ http/ol9.ks: http/ol9.ks.in
 clean:
 	${RM} -rf output-ol9 ol9.tar.gz http/ol9.ks
 
-.INTERMEDIATE: http/ol9.ks
+
diff --git a/ol9/README.md b/ol9/README.md
@@ -30,7 +30,7 @@ To use a proxy during the installation define the `KS_PROXY` variable in the
 environment, as bellow:
 
 ```shell
-export KS_PROXY="--proxy=\"${HTTP_PROXY}\""
+export KS_PROXY=$HTTP_PROXY
 ```
 
 ## Building an image

diff --git a/ol9/http/ol9.ks.in → ol9/http/ol9.ks.pkrtpl.hcl b/ol9/http/ol9.ks.in → ol9/http/ol9.ks.pkrtpl.hcl
diff --git a/rhel7/Makefile b/rhel7/Makefile
@@ -6,7 +6,7 @@ PACKER ?= packer
 PACKER_LOG ?= 0
 ISO ?= ${RHEL7_ISO_PATH}
 
-export PACKER_LOG KS_PROXY
+export PACKER_LOG
 
 .PHONY: all clean
 
@@ -23,4 +23,4 @@ http/rhel7.ks: http/rhel7.ks.in
 clean:
 	${RM} -rf output-rhel7 rhel7.tar.gz http/rhel7.ks
 
-.INTERMEDIATE: http/rhel7.ks
+
diff --git a/rhel7/README.md b/rhel7/README.md
@@ -27,7 +27,7 @@ cloud-init repository. To use a proxy during the installation define the
 `KS_PROXY` variable in the environment, as bellow:
 
 ```shell
-export KS_PROXY="--proxy=\"${HTTP_PROXY}\""
+export KS_PROXY=$HTTP_PROXY
 ```
 
 ## Building an image

diff --git a/rhel7/http/rhel7.ks.in → rhel7/http/rhel7.ks.pkrtpl.hcl b/rhel7/http/rhel7.ks.in → rhel7/http/rhel7.ks.pkrtpl.hcl
diff --git a/rhel8/Makefile b/rhel8/Makefile
@@ -6,7 +6,7 @@ PACKER ?= packer
 PACKER_LOG ?= 0
 ISO ?= ${RHEL8_ISO_PATH}
 
-export PACKER_LOG KS_PROXY
+export PACKER_LOG
 
 .PHONY: all clean
 
@@ -23,4 +23,3 @@ http/rhel8.ks: http/rhel8.ks.in
 clean:
 	${RM} -rf output-rhel8 rhel8.tar.gz http/rhel8.ks
 
-.INTERMEDIATE: http/rhel8.ks
diff --git a/rhel8/README.md b/rhel8/README.md
@@ -27,7 +27,7 @@ cloud-init repository. To use a proxy during the installation define the
 `KS_PROXY` variable in the environment, as bellow:
 
 ```shell
-export KS_PROXY="--proxy=\"${HTTP_PROXY}\""
+export KS_PROXY=$HTTP_PROXY
 ```
 
 ## Building an image

diff --git a/rhel8/http/rhel8.ks.in → rhel8/http/rhel8.ks.pkrtpl.hcl b/rhel8/http/rhel8.ks.in → rhel8/http/rhel8.ks.pkrtpl.hcl
diff --git a/rhel9/Makefile b/rhel9/Makefile
@@ -6,7 +6,7 @@ PACKER ?= packer
 PACKER_LOG ?= 0
 ISO ?= rhel-baseos-9.1-x86_64-dvd.iso
 
-export PACKER_LOG KS_PROXY
+export PACKER_LOG
 
 .PHONY: all clean
 
@@ -23,4 +23,4 @@ http/rhel9.ks: http/rhel9.ks.in
 clean:
 	${RM} -rf output-rhel9 rhel9.tar.gz http/rhel9.ks
 
-.INTERMEDIATE: http/rhel9.ks
+
diff --git a/rhel9/README.md b/rhel9/README.md
@@ -27,7 +27,7 @@ cloud-init repository. To use a proxy during the installation define the
 `KS_PROXY` variable in the environment, as bellow:
 
 ```shell
-export KS_PROXY="--proxy=\"${HTTP_PROXY}\""
+export KS_PROXY=$HTTP_PROXY
 ```
 
 ## Building an image

diff --git a/rhel9/http/rhel9.ks.in → rhel9/http/rhel9.ks.pkrtpl.hcl b/rhel9/http/rhel9.ks.in → rhel9/http/rhel9.ks.pkrtpl.hcl
diff --git a/rocky9/Makefile b/rocky9/Makefile
@@ -5,7 +5,7 @@ include ../scripts/check.mk
 PACKER ?= packer
 PACKER_LOG ?= 0
 
-export PACKER_LOG KS_PROXY
+export PACKER_LOG
 
 .PHONY: all clean
 
@@ -22,4 +22,3 @@ http/rocky.ks: http/rocky.ks.in
 clean:
 	${RM} -rf output-rocky9 rocky9.tar.gz http/rocky.ks
 
-.INTERMEDIATE: http/rocky.ks
diff --git a/rocky9/README.md b/rocky9/README.md
@@ -26,7 +26,7 @@ The Packer template downloads the Rocky ISO image from the Internet. You can tel
 To use a proxy during the installation define the `KS_PROXY` variable in the environment, as bellow:
 
 ```shell
-export KS_PROXY="--proxy=\"${HTTP_PROXY}\""
+export KS_PROXY=$HTTP_PROXY
 ```
 
 

diff --git a/rocky9/http/rocky.ks.in → rocky9/http/rocky.ks.pkrtpl.hcl b/rocky9/http/rocky.ks.in → rocky9/http/rocky.ks.pkrtpl.hcl
diff --git a/sles12/README.md b/sles12/README.md
@@ -26,7 +26,7 @@ The deployment image may be customized using `cloud-init` configuration. Check t
 The Packer template pulls all packages from the upstream image. To use a proxy during the installation define the `KS_PROXY` variable in the environment, as bellow:
 
 ```shell
-export KS_PROXY="--proxy=\"${HTTP_PROXY}\""
+export KS_PROXY=$HTTP_PROXY
 ```
 
 ## Building an image