Turning off core-repo mirror feature by default, as most enterprise

deployments may not want this behavior, and it is not ideal with
RHN setups.  Changed manpage docs appropriately.

Also fixing bug where source_repo detection went up one directory
to high...

4 files changed, 6 insertions, 5 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 2ab4955..b0e2f2b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ Cobbler CHANGELOG
   (ex: cobbler and koan from FC6extras, w/o games).
 - More consistant naming on imports, regardless of data source.
 - Teach cobbler to remove .olddata dirs, which can happen if createrepo crashes or is killed mid-process
+- Default yum_core_repos_from_server to 0 
 
 * Thu Apr 05 2007 - 0.4.6
 - Bind cobbler_syslogd to all addresses
diff --git a/cobbler/action_import.py b/cobbler/action_import.py
index 83874e3..e4dbc11 100644
--- a/cobbler/action_import.py
+++ b/cobbler/action_import.py
@@ -259,7 +259,7 @@ class Importer:
            print "- traversing distro %s" % distro.name
            if distro.kernel.find("ks_mirror") != -1:
                basepath = os.path.dirname(distro.kernel)
-               top = "/".join(basepath.split("/")[0:-3]) # up one level
+               top = "/".join(basepath.split("/")[0:-2]) # up one level
                print "- descent into %s" % top
                os.path.walk(top, self.repo_scanner, distro)
            else:
diff --git a/cobbler/settings.py b/cobbler/settings.py
index 4af8f65..c4f3b36 100644
--- a/cobbler/settings.py
+++ b/cobbler/settings.py
@@ -41,7 +41,7 @@ DEFAULTS = {
     },
     "syslog_port"                 : 25150,
     "minimize_syncs"              : 1,
-    "yum_core_mirror_from_server" : 1
+    "yum_core_mirror_from_server" : 0
 }
 
 
diff --git a/docs/cobbler.pod b/docs/cobbler.pod
index dfe8985..30d84c5 100644
--- a/docs/cobbler.pod
+++ b/docs/cobbler.pod
@@ -512,9 +512,9 @@ cobbler adds support for rsync and SSH locations, where as yum's reposync only s
 (http/ftp).
 
 Note that if a cobbler import provides enough information to use the boot server as a yum mirror for
-core packages, cobbler will set up kickstarts to use the cobbler server as a mirror instead of the 
-outside world.  If this feature is undesirable, it can be turned off by setting yum_core_mirror_from_server
-to 0 in /var/lib/cobbler/settings (and rerunning "cobbler sync").  You may want to disable this feature
+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.
 
 =head2 KICKSTART TRACKING