diff --git a/ubuntu_image/__main__.py b/ubuntu_image/__main__.py index 7610f8e7..3071e708 100644 --- a/ubuntu_image/__main__.py +++ b/ubuntu_image/__main__.py @@ -11,7 +11,7 @@ from ubuntu_image.assertion_builder import ModelAssertionBuilder from ubuntu_image.classic_builder import ClassicBuilder from ubuntu_image.helpers import ( - DoesNotFit, PrivilegeError, as_size, get_host_arch, + DoesNotFit, PrivilegeError, as_size, get_host_distro) from ubuntu_image.hooks import HookError from ubuntu_image.i18n import _ @@ -254,7 +254,7 @@ def parseargs(argv=None): help=_("""Distribution name to be specified to livecd-rootfs.""")) classic_cmd.add_argument( '-a', '--arch', - default=get_host_arch(), metavar='CPU-ARCHITECTURE', + default=None, metavar='CPU-ARCHITECTURE', help=_("""CPU architecture to be specified to livecd-rootfs. default value is builder arch.""")) classic_cmd.add_argument( diff --git a/ubuntu_image/classic_builder.py b/ubuntu_image/classic_builder.py index 41839b66..f28a2889 100644 --- a/ubuntu_image/classic_builder.py +++ b/ubuntu_image/classic_builder.py @@ -9,7 +9,7 @@ from tempfile import gettempdir from ubuntu_image.common_builder import AbstractImageBuilderState from ubuntu_image.helpers import ( - check_root_privilege, live_build, run) + check_root_privilege, get_host_arch, live_build, run) from ubuntu_image.parser import ( BootLoader, FileSystemType, StructureRole) @@ -67,6 +67,9 @@ def prepare_image(self): env['EXTRA_PPAS'] = self.args.extra_ppas # Only genereate a single rootfs tree for classic image creation. env['IMAGEFORMAT'] = 'none' + # ensure ARCH is set + if self.args.arch is None: + env['ARCH'] = get_host_arch() live_build(self.unpackdir, env) except CalledProcessError: if self.args.debug: