[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at v0.0.3-277-g37faa02

[root]

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  37faa02eb17517c860f734ac9f78d1adfc059c3c (commit)
      from  5e0a901d43ebd5c14958f221767a82a34d3e2adc (commit)

- Log -----------------------------------------------------------------
commit 37faa02eb17517c860f734ac9f78d1adfc059c3c
Author: root <root at mdehaan.rdu.redhat.com>
Date:   Wed Aug 29 18:25:58 2007 -0400

    Correct package name and do not install certain packages non-virtually
-----------------------------------------------------------------------

Diffstat:
 service/kickstart/kick-fc6.ks   |    2 +-
 service/modules/provisioning.py |   11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/service/kickstart/kick-fc6.ks b/service/kickstart/kick-fc6.ks
index 7187842..267cce7 100755
--- a/service/kickstart/kick-fc6.ks
+++ b/service/kickstart/kick-fc6.ks
@@ -58,7 +58,7 @@ EOF
 
 %packages
 ntp
-brctl
+bridge_utils
 $node_common_packages
 $node_virt_packages
 $node_bare_packages
diff --git a/service/modules/provisioning.py b/service/modules/provisioning.py
index 6fe5ca6..93b7d61 100755
--- a/service/modules/provisioning.py
+++ b/service/modules/provisioning.py
@@ -271,17 +271,18 @@ class CobblerTranslatedProfile:
        # FIXME: currently not used...
        ks_meta["node_virt_packages"] = ""
 
-       if distribution_name.find("xen") != -1:
-           ks_meta["node_bare_packages"] = "libvirt\npython-virtinst\nxend\n"
-       else:
-           ks_meta["node_bare_packages"] = "libvirt\npython-virtinst\nqemu\nkvm\n"
 
        ks_meta["network_param"]        = ""
        if from_db.has_key("is_container") and from_db["is_container"] != 0:
            # qemu won't be installed for Xen but it's ok if that command fails...
            # we do want to make sure libvirt is started though
-           ks_meta["extra_post_magic"]     = "/sbin/chkconfig 345 qemu on\n" 
            ks_meta["network_param"]        = "--allow-bridge-config"     
+           if distribution_name.find("xen") != -1:
+               ks_meta["node_bare_packages"] = "libvirt\npython-virtinst\nxend\n"
+               ks_meta["extra_post_magic"]   = ""
+           else:
+               ks_meta["extra_post_magic"]   = "/sbin/chkconfig 345 qemu on\n" 
+               ks_meta["node_bare_packages"] = "libvirt\npython-virtinst\nqemu\nkvm\n"
 
        ks_meta["cryptpw"]              = "$1$mF86/UHC$WvcIcX2t6crBz2onWxyac." # FIXME
        ks_meta["token_param"]          = "--profile=%s" % from_db["name"]

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  5e0a901d43ebd5c14958f221767a82a34d3e2adc \
  37faa02eb17517c860f734ac9f78d1adfc059c3c