Removing docs on yum_core_mirror_from_server (off by default), now explaining yum_post_install_mirror (which is on by default, and only slightly different).

3 files changed, 5 insertions, 4 deletions

diff --git a/cobbler/settings.py b/cobbler/settings.py
index c68e0bf..8a3c7f7 100644
--- a/cobbler/settings.py
+++ b/cobbler/settings.py
@@ -53,7 +53,7 @@ DEFAULTS = {
     "xmlrpc_port"                 : 25151,
     "xmlrpc_rw_enabled"           : 0,
     "xmlrpc_rw_port"              : 25152,
-    "yum_core_mirror_from_server" : 0,
+    "yum_post_install_mirror"     : 1,
     "yumdownloader_flags"         : "-resolve"
 }
 
diff --git a/config/settings b/config/settings
index 10f8892..85d6395 100644
--- a/config/settings
+++ b/config/settings
@@ -28,5 +28,5 @@ webdir: /var/www/cobbler
 xmlrpc_port: 25151
 xmlrpc_rw_enabled: 0
 xmlrpc_rw_port: 25152
-yum_core_mirror_from_server: 0
+yum_post_install_mirror: 0
 yumdownloader_flags: "-resolve"
diff --git a/docs/cobbler.pod b/docs/cobbler.pod
index 0ca8d85..5d53811 100644
--- a/docs/cobbler.pod
+++ b/docs/cobbler.pod
@@ -308,7 +308,8 @@ somewhat experimental.
 This name is used as the save location for the mirror.  If the mirror represented, say, Fedora Core
 6 i386 updates, a good name would be "fc6i386updates".  Again, be specific.
 
-This name corresponds with values given to the --repos parameter of "cobbler profile add".  If a profile has a --repos value that matches the name given here, that repo can be automatically set up during provisioning (when supported) and installed systems will also use the boot server as a mirror (unless "yum_core_mirror_from_server" is disabled in the settings file).
+This name corresponds with values given to the --repos parameter of "cobbler profile add".  If a profile has a --repos value that matches the name given here, that repo can be automatically set up during provisioning (when supported) and installed systems will also use the boot server as a mirror (unless "yum_post_install_mirror" is disabled in the settings file).  By default the provisioning server
+will act as a mirror to systems it installs, which may not be desirable for laptop configurations, etc.
 
 Distros that can make use of yum repositories during kickstart include FC6 and later, RHEL 5 and later, and derivative distributions.
 
@@ -625,7 +626,7 @@ B<cobbler reposync reponame1 reponame2 ...>
 
 When updating repos by name, a repo will be updated even if it is set to be not updated during a regular reposync operation (ex: cobbler repo edit --name=reponame1 --keep-updated=0).
 
-Note that if a cobbler import provides enough information to use the boot server as a yum mirror for core packages, cobbler can set up kickstarts to use the cobbler server as a mirror instead of the outside world.  If this feature is desirable, it can be turned on by setting yum_core_mirror_from_server to 1 in /var/lib/cobbler/settings (and rerunning "cobbler sync").  You should not enable this feature if machines are provisioned on a different VLAN/network than production.
+Note that if a cobbler import provides enough information to use the boot server as a yum mirror for core packages, cobbler can set up kickstarts to use the cobbler server as a mirror instead of the outside world.  If this feature is not desirable, it can be turned on by setting yum_post_install_mirror to 0 in /var/lib/cobbler/settings (and rerunning "cobbler sync").  You should disable this feature if machines are provisioned on a different VLAN/network than production, or if you are provisioning laptops that will want to acquire updates on multiple networks.
 
 =head2 PXE BOOT LOOP PREVENTION