diff options
| author | James Laska <jlaska@redhat.com> | 2008-12-16 16:04:09 -0500 |
|---|---|---|
| committer | James Laska <jlaska@redhat.com> | 2008-12-16 16:04:09 -0500 |
| commit | 09a9dbc4abefa64bcd0093925230d72a6fa69788 (patch) | |
| tree | c9e3c6013815f054af0978d137d4101f74533a6b /installer_templates | |
| parent | 2da819c3a394bdf92d6c8a524800c4147889a098 (diff) | |
| parent | d43faca500010f2591ac5922d422e8ea1b46b418 (diff) | |
| download | cobbler-09a9dbc4abefa64bcd0093925230d72a6fa69788.tar.gz cobbler-09a9dbc4abefa64bcd0093925230d72a6fa69788.tar.xz cobbler-09a9dbc4abefa64bcd0093925230d72a6fa69788.zip | |
Merge commit 'origin/devel' into devel
Conflicts:
cobbler/pxegen.py
Diffstat (limited to 'installer_templates')
| -rw-r--r-- | installer_templates/defaults | 2 | ||||
| -rw-r--r-- | installer_templates/settings.template | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/installer_templates/defaults b/installer_templates/defaults index ccd01063..8a5eebad 100644 --- a/installer_templates/defaults +++ b/installer_templates/defaults @@ -10,4 +10,4 @@ redhat_management_type: "off" redhat_management_server: "xmlrpc.rhn.redhat.com" redhat_management_key: "" server:'127.0.0.1' -yum_post_install_mirror:0 +yum_post_install_mirror:1 diff --git a/installer_templates/settings.template b/installer_templates/settings.template index 822c7fe6..01c19a2d 100644 --- a/installer_templates/settings.template +++ b/installer_templates/settings.template @@ -55,7 +55,11 @@ default_password_crypted: "\$1\$mF86/UHC\$WvcIcX2t6crBz2onWxyac." default_name_servers: [] # for libvirt based installs in koan, if no virt bridge -# is specified, which bridge do we try? +# is specified, which bridge do we try? For EL 4/5 hosts +# this should be xenbr0, for all versions of Fedora, try +# "virbr0". This can be overriden on a per-profile +# basis or at the koan command line though this saves +# typing to just set it here to the most common option. default_virt_bridge: xenbr0 # if koan is invoked without --virt-type and no virt-type |