On foreign architectures, it is quite possible to
not have "necessary_packages", so append the user-
specified list and the necessary list separately.
Tidy up undefined local variables.
self.runcmd(['install-mbr', self.settings['image']])
def setup_kpartx(self):
self.runcmd(['install-mbr', self.settings['image']])
def setup_kpartx(self):
out = self.runcmd(['kpartx', '-avs', self.settings['image']])
if self.settings['bootsize']:
bootindex = 0
out = self.runcmd(['kpartx', '-avs', self.settings['image']])
if self.settings['bootsize']:
bootindex = 0
else:
rootindex = 0
parts = 1
else:
rootindex = 0
parts = 1
devices = [line.split()[2]
for line in out.splitlines()
if line.startswith('add map ')]
devices = [line.split()[2]
for line in out.splitlines()
if line.startswith('add map ')]
include.append('sudo')
args = ['debootstrap', '--arch=%s' % self.settings['arch']]
include.append('sudo')
args = ['debootstrap', '--arch=%s' % self.settings['arch']]
- if self.settings['package'] and len(necessary_packages) > 0:
+ if self.settings['package']:
- '--include=%s' % ','.join(necessary_packages + include))
+ '--include=%s' % ','.join(include))
+ if len(necessary_packages) > 0:
+ args.append(
+ '--include=%s' % ','.join(necessary_packages))
if self.settings['foreign']:
args.append('--foreign')
if self.settings['variant']:
if self.settings['foreign']:
args.append('--foreign')
if self.settings['variant']: