diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-09-25 16:37:03 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-09-25 16:37:03 -0400 |
| commit | 60161d6cdea71c44a962531b9e28065f113959c6 (patch) | |
| tree | 966ffae14c815ef0d4e6287107c68266a7fbdc12 | |
| parent | cc41053bab40d4a64c7eaa12df6616fcb7e782af (diff) | |
| parent | 11155bcb62ea986106cafcbfdb4ddef7b4167399 (diff) | |
| download | cobbler-60161d6cdea71c44a962531b9e28065f113959c6.tar.gz cobbler-60161d6cdea71c44a962531b9e28065f113959c6.tar.xz cobbler-60161d6cdea71c44a962531b9e28065f113959c6.zip | |
Merge branch 'master' into devel
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | cobbler/modules/cli_distro.py | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -21,6 +21,8 @@ Cobbler CHANGELOG - ??? - 1.2.5 (pending) - (BUGF) expose --arch for "cobbler image add" - (BUGF) unbreak dnsmasq DHCP management, similar to ISC bug +- (BUGF) fix --arch for cobbler distro add/edit +- (BUGF) fix merge error with remote.py's remove_profile function (fix webapp) - Mon Sep 08 2008 - 1.2.4 - (BUGF) simple rebuild to remove cli_report.py, which is not in git diff --git a/cobbler/modules/cli_distro.py b/cobbler/modules/cli_distro.py index e87b3116..340ac862 100644 --- a/cobbler/modules/cli_distro.py +++ b/cobbler/modules/cli_distro.py @@ -89,6 +89,8 @@ class DistroFunction(commands.CobblerFunction): return True if not "dumpvars" in self.args: + if self.options.arch: + obj.set_arch(self.options.arch) if self.options.kernel: obj.set_kernel(self.options.kernel) if self.options.initrd: |