summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2006-05-02 09:50:43 -0400
committerJim Meyering <jim@meyering.net>2006-05-02 09:50:43 -0400
commit535fe4a5d4bdcf489a58f352b11abe0350718e7a (patch)
tree593253a1ffbdf1e6e531d7cff88b1a1e08b0cb1e
parentf5386efa9057b600017fac7e9713ca32b995ff91 (diff)
downloadthird_party-cobbler-535fe4a5d4bdcf489a58f352b11abe0350718e7a.tar.gz
third_party-cobbler-535fe4a5d4bdcf489a58f352b11abe0350718e7a.tar.xz
third_party-cobbler-535fe4a5d4bdcf489a58f352b11abe0350718e7a.zip
Updated example config, edited strings, removed file not in use.
-rw-r--r--example_cfg32
-rw-r--r--msg.py2
-rw-r--r--xmldict.py0
3 files changed, 25 insertions, 9 deletions
diff --git a/example_cfg b/example_cfg
index c35f5be..9bb2c2d 100644
--- a/example_cfg
+++ b/example_cfg
@@ -1,23 +1,39 @@
---
distros:
-
- initrd: '/scratch/initrd.img'
- kernel: '/scratch/vmlinuz'
+ initrd: /scratch/initrd.img
+ kernel: /scratch/vmlinuz
kernel_options: ''
- name: testdistro0
+ name: fc5
+ -
+ initrd: '/xenboot'
+ kernel: '/xenboot'
+ kernel_options: ''
+ name: xenfc5
profiles:
-
- distro: testdistro0
+ distro: xenfc5
+ kernel_options: ''
+ kickstart: /scratch/fc5.cfg
+ name: xenfc5machine
+ xen_file_size: 2
+ xen_mac: ''
+ xen_name: koan_fc5guest
+ xen_paravirt: True
+ xen_ram: 256
+ -
+ distro: fc5
kernel_options: ''
- kickstart: '/scratch/rawhide.cfg'
- name: testprofile0
+ kickstart: /scratch/fc5.cfg
+ name: fc5machine
xen_file_size: 2
xen_mac: ''
- xen_name: xen
+ xen_name: na
xen_paravirt: True
xen_ram: 2048
systems:
-
kernel_options: ''
name: mdehaan
- profile: testprofile0
+ profile: fc5machine
+
diff --git a/msg.py b/msg.py
index 4169b76..e974bc6 100644
--- a/msg.py
+++ b/msg.py
@@ -35,7 +35,7 @@ msg_table = {
"err_resolv" : "system (%s) did not resolve",
"err_kickstart" : "kickstart (%s) for item (%s) is not valid",
"err_kickstart2" : "error mirroring kickstart file (%s) to (%s)",
- "orphan_profile2" : "profile does not reference a distro",
+ "orphan_profile2" : "system references a non-existant profile",
"orphan_system2" : "system does not reference a profile",
"orphan_profile" : "removing this distro would break a profile",
"orphan_system" : "removing this profile would break a system",
diff --git a/xmldict.py b/xmldict.py
deleted file mode 100644
index e69de29..0000000
--- a/xmldict.py
+++ /dev/null