Closed Fryguy closed 2 years ago
@bdunne I've updated it as discussed. Can you take another look?
Backported to morphy
in commit 4e58f32c8682f52089341489113fdda901f308fe.
commit 4e58f32c8682f52089341489113fdda901f308fe
Author: Brandon Dunne <brandondunne@hotmail.com>
Date: Fri Jan 7 13:55:53 2022 -0500
Merge pull request #499 from Fryguy/ensure_kickstart_logging_disabled
Add ability to inspect the ISO for kickstart logging
(cherry picked from commit 9cd805052f46282e38134920582c85d52ffaaed0)
@Fryguy A conflict occurred during the backport of this pull request to lasker
.
If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the lasker
branch in order to resolve this.
Conflict details:
diff --cc config/base.tdl.erb
index 87e85a4,e49297a..0000000
--- a/config/base.tdl.erb
+++ b/config/base.tdl.erb
@@@ -6,7 -6,7 +6,11 @@@
<version>4</version>
<arch>x86_64</arch>
<install type="iso">
++<<<<<<< HEAD
+ <iso>file:///build/isos/CentOS-Stream-8-x86_64-20210608-dvd1.iso</iso>
++=======
+ <iso>file://<%= ISO_FILE.to_s %></iso>
++>>>>>>> 9cd8050 (Merge pull request #499 from Fryguy/ensure_kickstart_logging_disabled)
</install>
</os>
<description>CentOS TDL meant to be used with custom kickstart for manageiq.</description>
* Unmerged path bin/iso_modify.sh
@Fryguy A conflict occurred during the backport of this pull request to lasker
.
If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the lasker
branch in order to resolve this.
Conflict details:
diff --cc config/base.tdl.erb
index 87e85a4,e49297a..0000000
--- a/config/base.tdl.erb
+++ b/config/base.tdl.erb
@@@ -6,7 -6,7 +6,11 @@@
<version>4</version>
<arch>x86_64</arch>
<install type="iso">
++<<<<<<< HEAD
+ <iso>file:///build/isos/CentOS-Stream-8-x86_64-20210608-dvd1.iso</iso>
++=======
+ <iso>file://<%= ISO_FILE.to_s %></iso>
++>>>>>>> 9cd8050 (Merge pull request #499 from Fryguy/ensure_kickstart_logging_disabled)
</install>
</os>
<description>CentOS TDL meant to be used with custom kickstart for manageiq.</description>
@bdunne Please review.
Expected usage is that if someone doesn't want kickstart logging, they can pass--no-ks-log
to vmbuildI intentionally made the iso_modified.sh a shell script to mirror iso_modify.sh. That way after someone manually changes it with iso_modify.sh, they can check it with iso_modified.sh in a similar way.As dicsussed, I've changed the iso_modify.sh to first check if modified, and then we just always call it from the build. Specific modifications can be opted out with ENV vars.
Backport to morphy depends on https://github.com/ManageIQ/manageiq-appliance-build/pull/495