diff options
| author | mdehaan@mdehaan.rdu.redhat.com <> | 2007-02-19 13:46:57 -0500 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-02-19 13:46:57 -0500 |
| commit | c8c37ed4f1903b9259d8a013997d45c44d58322f (patch) | |
| tree | 60a3571a008151a637659faf076664871ebf73be | |
| parent | fbd232abc00ea43d64f7e30ee03052d10b83328f (diff) | |
| download | third_party-cobbler-c8c37ed4f1903b9259d8a013997d45c44d58322f.tar.gz third_party-cobbler-c8c37ed4f1903b9259d8a013997d45c44d58322f.tar.xz third_party-cobbler-c8c37ed4f1903b9259d8a013997d45c44d58322f.zip | |
Fix the backwards compatibility code around TEMPLATE:: and also change
the template files to use basic $placeholders instead of TEMPLATE::
| -rw-r--r-- | cobbler/action_sync.py | 2 | ||||
| -rw-r--r-- | kickstart_fc5.ks | 6 | ||||
| -rw-r--r-- | kickstart_fc6.ks | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index 13ddd34..a2343f4 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -466,7 +466,7 @@ class BootSync: # backward support for Cobbler's legacy (and slightly more readable) # template syntax. - data.replace("TEMPLATE::","$") + data = data.replace("TEMPLATE::","$") data = "#errorCatcher Echo\n" + data diff --git a/kickstart_fc5.ks b/kickstart_fc5.ks index d13b034..4de0f30 100644 --- a/kickstart_fc5.ks +++ b/kickstart_fc5.ks @@ -16,7 +16,7 @@ keyboard us # System language lang en_US # Use network installation -url --url=TEMPLATE::tree +url --url=$tree # Network information network --bootproto=dhcp --device=eth0 --onboot=on # Reboot after installation @@ -52,6 +52,6 @@ part swap --size=1024 --ondisk=\$d1 --asprimary %packages %post -TEMPLATE::yum_config_stanza -TEMPLATE::kickstart_done +$yum_config_stanza +$kickstart_done diff --git a/kickstart_fc6.ks b/kickstart_fc6.ks index b696e9e..f656691 100644 --- a/kickstart_fc6.ks +++ b/kickstart_fc6.ks @@ -16,9 +16,9 @@ keyboard us # System language lang en_US # Use network installation -url --url=TEMPLATE::tree +url --url=$tree # If any cobbler repo definitions were referenced in the kickstart profile, include them here. -TEMPLATE::yum_repo_stanza +$yum_repo_stanza # Network information network --bootproto=dhcp --device=eth0 --onboot=on # Reboot after installation @@ -54,6 +54,6 @@ part swap --size=1024 --ondisk=\$d1 --asprimary %packages %post -TEMPLATE::yum_config_stanza -TEMPLATE::kickstart_done +$yum_config_stanza +$kickstart_done |