summaryrefslogtreecommitdiffstats
path: root/cobbler
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2009-03-06 11:52:27 -0500
committerMichael DeHaan <mdehaan@redhat.com>2009-03-06 11:52:27 -0500
commitd375aa64634a1a8b3d56793eeec9dea6de7bab20 (patch)
treed965be65a04b52b2fd4b018eeaee78099282b74e /cobbler
parent7165bc89643431ddf4b843319bcf2036a9727142 (diff)
parent0aa8d1c1d83300c14b8c53bf307b360a9e202aa0 (diff)
downloadcobbler-d375aa64634a1a8b3d56793eeec9dea6de7bab20.tar.gz
cobbler-d375aa64634a1a8b3d56793eeec9dea6de7bab20.tar.xz
cobbler-d375aa64634a1a8b3d56793eeec9dea6de7bab20.zip
Merge commit 'lazzurs/lazzurs-devel' into devel
Diffstat (limited to 'cobbler')
-rw-r--r--cobbler/item_system.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cobbler/item_system.py b/cobbler/item_system.py
index ce35817e..b7e77448 100644
--- a/cobbler/item_system.py
+++ b/cobbler/item_system.py
@@ -604,7 +604,7 @@ class System(item.Item):
if power_type is None:
power_type = ""
power_type = power_type.lower()
- valid = "bullpap wti apc_snmp ether-wake ipmilan drac ipmitool ilo rsai lpar bladecenter virsh integrity none"
+ valid = "bullpap wti apc_snmp ether-wake ipmilan drac ipmitool ilo rsa lpar bladecenter virsh integrity none"
choices = valid.split(" ")
choices.sort()
if power_type not in choices: