summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-11-19 10:45:20 -0500
committerMichael DeHaan <mdehaan@redhat.com>2008-11-19 10:45:20 -0500
commit1bbf60bdc266476be4f90519b2ca48035648e211 (patch)
treef4e1805f74fe5f7ddb7eb253002f93706266cee2
parented6c5feacd8d4b9ccea621b96b36f2694cb90f16 (diff)
downloadcobbler-1bbf60bdc266476be4f90519b2ca48035648e211.tar.gz
cobbler-1bbf60bdc266476be4f90519b2ca48035648e211.tar.xz
cobbler-1bbf60bdc266476be4f90519b2ca48035648e211.zip
Add a snippet to default kickstarts that sets the cobbler server environment variable so machines
that cobbler installs do not have to use the --server parameter with koan.
-rw-r--r--kickstarts/legacy.ks1
-rw-r--r--kickstarts/sample.ks1
-rw-r--r--kickstarts/sample_end.ks1
-rw-r--r--setup.py1
-rw-r--r--snippets/koan_environment2
5 files changed, 6 insertions, 0 deletions
diff --git a/kickstarts/legacy.ks b/kickstarts/legacy.ks
index a4fd8c2e..493b30ce 100644
--- a/kickstarts/legacy.ks
+++ b/kickstarts/legacy.ks
@@ -48,5 +48,6 @@ $yum_config_stanza
SNIPPET::post_install_kernel_options
SNIPPET::post_install_network_config
SNIPPET::download_config_files
+SNIPPET::koan_environment
$kickstart_done
diff --git a/kickstarts/sample.ks b/kickstarts/sample.ks
index 6af365dd..2f5e408b 100644
--- a/kickstarts/sample.ks
+++ b/kickstarts/sample.ks
@@ -54,5 +54,6 @@ $SNIPPET('post_install_kernel_options')
$SNIPPET('post_install_network_config')
$SNIPPET('func_register_if_enabled')
$SNIPPET('download_config_files')
+$SNIPPET('koan_environment')
$kickstart_done
diff --git a/kickstarts/sample_end.ks b/kickstarts/sample_end.ks
index 3f914928..e1d0e8fd 100644
--- a/kickstarts/sample_end.ks
+++ b/kickstarts/sample_end.ks
@@ -58,5 +58,6 @@ SNIPPET::post_install_kernel_options
SNIPPET::post_install_network_config
SNIPPET::func_register_if_enabled
SNIPPET::download_config_files
+SNIPPET::koan_environment
$kickstart_done
%end
diff --git a/setup.py b/setup.py
index f7bf3f20..8bc5a6d3 100644
--- a/setup.py
+++ b/setup.py
@@ -239,6 +239,7 @@ if __name__ == "__main__":
(snippets, ['snippets/func_install_if_enabled']),
(snippets, ['snippets/func_register_if_enabled']),
(snippets, ['snippets/download_config_files']),
+ (snippets, ['snippets/koan_environment']),
# documentation
(manpath, ['docs/cobbler.1.gz']),
diff --git a/snippets/koan_environment b/snippets/koan_environment
new file mode 100644
index 00000000..dd470c61
--- /dev/null
+++ b/snippets/koan_environment
@@ -0,0 +1,2 @@
+echo "export COBBLER_SERVER=$server" > /etc/profile.d/cobbler.sh
+echo "setenv COBBLER_SERVER $server" > /etc/profile.d/cobbler.csh