diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:44:50 -0700 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:48:08 -0700 |
| commit | f5b2645d869b76598c18527d388ed76719c06bdd (patch) | |
| tree | 659f3ee719b437817a02db4a31dbd37a65972412 /modules/auto_installation | |
| parent | ae1976228660588902a904f7509a106b790531cb (diff) | |
| download | puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.gz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.bz2 puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.xz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.zip | |
Revert "Use @ when accessing variables in templates"
Variables defined within a template can't be accessed with @. This
change needs to be reworked to eliminate those cases.
This reverts commits 2c7da665 and ae197622.
Diffstat (limited to 'modules/auto_installation')
| -rw-r--r-- | modules/auto_installation/templates/default | 4 | ||||
| -rw-r--r-- | modules/auto_installation/templates/menu | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/auto_installation/templates/default b/modules/auto_installation/templates/default index 637a73b2..a9ea8de3 100644 --- a/modules/auto_installation/templates/default +++ b/modules/auto_installation/templates/default @@ -4,12 +4,12 @@ TIMEOUT 100 NOESCAPE 1 MENU SHIFTKEY 1 -MENU TITLE PXE Boot on <%= @fqdn %> +MENU TITLE PXE Boot on <%= fqdn %> LABEL local MENU LABEL Local localboot 0 <% for m in menu_entries %> -INCLUDE pxelinux.cfg/m/<%= @m %> +INCLUDE pxelinux.cfg/m/<%= m %> <% end %> diff --git a/modules/auto_installation/templates/menu b/modules/auto_installation/templates/menu index 1b32ffb7..3d0ce6fa 100644 --- a/modules/auto_installation/templates/menu +++ b/modules/auto_installation/templates/menu @@ -1,5 +1,5 @@ -LABEL <%= @name %> +LABEL <%= name %> MENU DEFAULT - MENU LABEL Install <%= @label %> - kernel <%= @kernel_path %> - append <%= @append %> + MENU LABEL Install <%= label %> + kernel <%= kernel_path %> + append <%= append %> |