[Et-mgmt-commits-list] [SCM] cobbler branch, master now at v0.4.8-61-g6b45668

[Michael DeHaan]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  6b45668dde8d84b5e10fe9f42fcbb96d2e592c99 (commit)
       via  8755b0e0bd2219cd44133bfacbc8afc58595c3e5 (commit)
      from  17dae0213589107c0d916e1e26ab2376540605fd (commit)

- Log -----------------------------------------------------------------
commit 6b45668dde8d84b5e10fe9f42fcbb96d2e592c99
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Fri Jun 29 10:15:31 2007 -0400

    Debian has a different argument for 'ksdevice', also add extra D/L info
    to web page.

commit 8755b0e0bd2219cd44133bfacbc8afc58595c3e5
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Fri Jun 29 09:56:18 2007 -0400

    Remove duplicate append.
-----------------------------------------------------------------------

Diffstat:
 cobbler/action_sync.py       |    1 +
 templates/pxesystem.template |    2 +-
 website/new/download.html    |    2 +-
 website/new/footer.html      |    9 +++++++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py
index 2e0c018..bfa09b2 100644
--- a/cobbler/action_sync.py
+++ b/cobbler/action_sync.py
@@ -637,6 +637,7 @@ class BootSync:
                 append_line = "%s autoyast=%s" % (append_line, kickstart_path)
             elif distro.breed == "debian":
                 append_line = "%s auto=true url=%s" % (append_line, kickstart_path)
+                append_line = append_line.replace("ksdevice","interface")
 
         # ---
         # store variables for templating
diff --git a/templates/pxesystem.template b/templates/pxesystem.template
index 1564d7e..b551164 100644
--- a/templates/pxesystem.template
+++ b/templates/pxesystem.template
@@ -3,5 +3,5 @@ prompt 0
 timeout 1
 label linux
         kernel $kernel_path
-        append $append_line
+        $append_line
 
diff --git a/website/new/download.html b/website/new/download.html
index 57a5086..040e859 100644
--- a/website/new/download.html
+++ b/website/new/download.html
@@ -55,7 +55,7 @@ yum install koan      # on target systems
 <h4>Centos Users</h4>
 <p>
 <blockquote>
-Cobbler will be part of Centos Extras shortly and will then be yum installable.  Until then, you will want to rebuild the source RPMs.  The process will be as in RHEL, though you should get the dependencies from "yum install" instead of the above hard-coded URLs.
+Cobbler for Centos 5 is included in <A HREF="http://dev.centos.org/">Centos Extras</A>.  Centos 4 users can use the RHEL 4 build instructions.
 </blockquote>
 </p>
 
diff --git a/website/new/footer.html b/website/new/footer.html
index f5d06cc..35be552 100644
--- a/website/new/footer.html
+++ b/website/new/footer.html
@@ -1,3 +1,12 @@
 <p>Copyright © 2007 Red Hat, Inc. and others. 
 A project from the <a href="http://et.redhat.com/">Red Hat Emerging Technologies Group</a>.<br />
 Website design is <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0</a>.
+
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "UA-2111813-2";
+urchinTracker();
+</script>
+
+

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  17dae0213589107c0d916e1e26ab2376540605fd \
  6b45668dde8d84b5e10fe9f42fcbb96d2e592c99