diff options
| author | James Laska <jlaska@redhat.com> | 2008-12-17 15:21:19 -0500 |
|---|---|---|
| committer | James Laska <jlaska@redhat.com> | 2008-12-17 15:21:19 -0500 |
| commit | 9d3d9bfda3ea04a3410b4f1f8bfd34496e440bf0 (patch) | |
| tree | c7fb36dc16dae6b28c87a0ad4a86a7add96cb616 /kickstarts | |
| parent | e728db23d0333eaf0969521ccd38b61abfa38414 (diff) | |
| parent | c3a971c7fb70efae3e45326edaca4a37833202f7 (diff) | |
| download | cobbler-9d3d9bfda3ea04a3410b4f1f8bfd34496e440bf0.tar.gz cobbler-9d3d9bfda3ea04a3410b4f1f8bfd34496e440bf0.tar.xz cobbler-9d3d9bfda3ea04a3410b4f1f8bfd34496e440bf0.zip | |
Merge commit 'origin/devel' into devel
Conflicts:
kickstarts/sample.ks
Diffstat (limited to 'kickstarts')
| -rw-r--r-- | kickstarts/legacy.ks | 4 | ||||
| -rw-r--r-- | kickstarts/sample.ks | 4 | ||||
| -rw-r--r-- | kickstarts/sample_end.ks | 6 |
3 files changed, 13 insertions, 1 deletions
diff --git a/kickstarts/legacy.ks b/kickstarts/legacy.ks index 8356ae9c..a51ec6b7 100644 --- a/kickstarts/legacy.ks +++ b/kickstarts/legacy.ks @@ -45,11 +45,15 @@ $SNIPPET('pre_anamon') %packages %post +# Begin yum configuration $yum_config_stanza +# End yum configuration $SNIPPET('post_install_kernel_options') $SNIPPET('post_install_network_config') $SNIPPET('download_config_files') $SNIPPET('koan_environment') $SNIPPET('redhat_register') +# Begin final steps $kickstart_done +# End final steps diff --git a/kickstarts/sample.ks b/kickstarts/sample.ks index 72b3adfd..e167a329 100644 --- a/kickstarts/sample.ks +++ b/kickstarts/sample.ks @@ -50,11 +50,15 @@ $SNIPPET('func_install_if_enabled') %post +# Start yum configuration $yum_config_stanza +# End yum configuration $SNIPPET('post_install_kernel_options') $SNIPPET('post_install_network_config') $SNIPPET('func_register_if_enabled') $SNIPPET('download_config_files') $SNIPPET('koan_environment') $SNIPPET('redhat_register') +# Start final steps $kickstart_done +# End final steps diff --git a/kickstarts/sample_end.ks b/kickstarts/sample_end.ks index 72e3f2c5..7c5464fc 100644 --- a/kickstarts/sample_end.ks +++ b/kickstarts/sample_end.ks @@ -54,12 +54,16 @@ $SNIPPET('func_install_if_enabled') %end %post +# Start yum configuration $yum_config_stanza +# End yum configuration $SNIPPET('post_install_kernel_options') $SNIPPET('post_install_network_config') $SNIPPET('func_register_if_enabled') $SNIPPET('download_config_files') $SNIPPET('koan_environment') -$kickstart_done $SNIPPET('redhat_register') +# Start final steps +$kickstart_done +# End final steps %end |