summaryrefslogtreecommitdiff
path: root/vmdebootstrap
diff options
context:
space:
mode:
authorNeil Williams <codehelp@debian.org>2014-12-23 17:29:15 +0000
committerNeil Williams <codehelp@debian.org>2014-12-23 17:29:15 +0000
commit05dcc3af8835fce167b6ddd9f29d8c72ae0e8a58 (patch)
tree8a2ab1200503582015bdd8a8af8480018901dec0 /vmdebootstrap
parent41ebf61957c1c3d168b5e048e465c6a7b0b57a1c (diff)
downloadvmdebootstrap-05dcc3af8835fce167b6ddd9f29d8c72ae0e8a58.tar.gz
drop necessary packages and use the include list directly
Diffstat (limited to 'vmdebootstrap')
-rwxr-xr-xvmdebootstrap16
1 files changed, 6 insertions, 10 deletions
diff --git a/vmdebootstrap b/vmdebootstrap
index 6f104da..e736c60 100755
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -370,15 +370,13 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth
msg = "(%s)" % self.settings['variant'] if self.settings['variant'] else ''
self.message('Debootstrapping %s %s' % (self.settings['distribution'], msg))
- if self.settings['foreign']:
- necessary_packages = []
- else:
- necessary_packages = ['acpid']
+ include = self.settings['package']
- if self.settings['grub']:
- necessary_packages.append('grub2')
+ if not self.settings['foreign']:
+ include.append('acpid')
- include = self.settings['package']
+ if self.settings['grub']:
+ include.append('grub2')
if not self.settings['no-kernel']:
if self.settings['arch'] == 'i386':
@@ -392,12 +390,10 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth
include.append('sudo')
args = ['debootstrap', '--arch=%s' % self.settings['arch']]
+
if self.settings['package']:
args.append(
'--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']: