diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2007-02-27 14:46:54 -0500 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-02-27 14:46:54 -0500 |
| commit | ba80455e5a4aeb807fea8b40ba4503bde4f035b5 (patch) | |
| tree | a763512359f174c2d23001ce0d93e832725d5fd7 /cobbler | |
| parent | 5a477fa66bd0d72cd9665cae5522eabd6d8fb5b3 (diff) | |
| download | third_party-cobbler-ba80455e5a4aeb807fea8b40ba4503bde4f035b5.tar.gz third_party-cobbler-ba80455e5a4aeb807fea8b40ba4503bde4f035b5.tar.xz third_party-cobbler-ba80455e5a4aeb807fea8b40ba4503bde4f035b5.zip | |
sseago's patch to set_kernel_options, plus some additional error handling around kernel options processing.
Plus some manpage/NEWS updates.
Diffstat (limited to 'cobbler')
| -rw-r--r-- | cobbler/cobbler_msg.py | 1 | ||||
| -rw-r--r-- | cobbler/item.py | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cobbler/cobbler_msg.py b/cobbler/cobbler_msg.py index 3e32e9d..6396706 100644 --- a/cobbler/cobbler_msg.py +++ b/cobbler/cobbler_msg.py @@ -125,6 +125,7 @@ _msg_table = { "exc_no_template" : "can't read /etc/cobbler/dhcp.template", "exc_dhcp_nomac" : "when cobbler is managing dhcpd.conf, all system names must be MAC addresses. Aborting.", "exc_ia64_noip" : "due to an IA64 bootloader limitation, system (%s) must define a pxe-address value (which is an IP address)", + "exc_kopts" : "Kernel options should be a space delimited list of values and key=value pairs", "lock" : "Locked. If cobbler is currently running, wait for termination, otherwise remove /var/lib/cobbler/lock", "check_ok" : """ No setup problems found. diff --git a/cobbler/item.py b/cobbler/item.py index 1249229..4263494 100644 --- a/cobbler/item.py +++ b/cobbler/item.py @@ -29,11 +29,11 @@ class Item(serializable.Serializable): def set_kernel_options(self,options): """ Kernel options are a space delimited list, - like 'a=b,c=d,e=f' or as a hash. + like 'a=b c=d e=f g h i=j' or a hash. """ - (success, value) = utils.input_string_or_hash(options," ") + (success, value) = utils.input_string_or_hash(options,None) if not success: - return False + raise cexceptions.CobblerException("exc_kopts") else: self.kernel_options = value return True |