Skip to content

Bugfix: Handle kernel/userland arch differences cleanly #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
luke-jr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bugfix: Handle kernel/userland arch differences cleanly #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions VMBuilder/plugins/ubuntu/distro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@ class Ubuntu(Distro):
]

# Maps host arch to valid guest archs
valid_archs = { 'amd64' : ['amd64', 'i386', 'lpia' ],
valid_archs = { 'x86_64' : ['amd64', 'i386', 'lpia' ],
'i386' : [ 'i386', 'lpia' ],
'i486' : [ 'i386', 'lpia' ],
'i586' : [ 'i386', 'lpia' ],
'i686' : [ 'i386', 'lpia' ],
'lpia' : [ 'i386', 'lpia' ] }

xen_kernel = ''
Expand All @@ -49,6 +52,7 @@ def register_options(self):

group = self.setting_group('General OS options')
self.host_arch = run_cmd('dpkg', '--print-architecture').rstrip()
self.kernel_arch = run_cmd('uname', '-m').rstrip()
group.add_setting('arch', extra_args=['-a'], default=self.host_arch, help='Specify the target architecture. Valid options: amd64 i386 lpia (defaults to host arch)')
group.add_setting('hostname', default='ubuntu', help='Set NAME as the hostname of the guest. Default: ubuntu. Also uses this name as the VM name.')

Expand Down Expand Up @@ -108,10 +112,10 @@ def preflight_check(self):
self.suite = getattr(mod, suite.capitalize())(self)

arch = self.get_setting('arch')
if arch not in self.valid_archs[self.host_arch] or \
if arch not in self.valid_archs[self.kernel_arch] or \
not self.suite.check_arch_validity(arch):
raise VMBuilderUserError('%s is not a valid architecture. Valid architectures are: %s' % (arch,
' '.join(self.valid_archs[self.host_arch])))
' '.join(self.valid_archs[self.kernel_arch])))

components = self.get_setting('components')
if not components:
Expand Down