Package: vmdebootstrap
Version: 0.7-1
Tags: upstream patch
>From 55c1b5d76903196b0a16a474411386c4a93b0ce8 Mon Sep 17 00:00:00 2001
From: Jan Gerber <j...@mailb.org>
Date: Thu, 9 Apr 2015 17:10:19 +0200
Subject: expose debootstrap --components
diff --git a/vmdebootstrap b/vmdebootstrap
index 49c21c8..648de18 100755
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -83,6 +83,9 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth
self.settings.string(
['variant'],
'select debootstrap variant it not using the default')
+ self.settings.string(
+ ['components'],
+ 'select debootstrap components it not using the default')
self.settings.boolean(
['extlinux'],
'install extlinux?',
@@ -412,6 +415,8 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth
def debootstrap(self, rootdir):
msg = "(%s)" % self.settings['variant'] if self.settings['variant'] else ''
+ if self.settings['components']:
+ msg += '[%s]' % self.settings['components']
self.message('Debootstrapping %s %s' % (self.settings['distribution'], msg))
include = self.settings['package']
@@ -445,6 +450,9 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth
if self.settings['variant']:
args.append('--variant')
args.append(self.settings['variant'])
+ if self.settings['components']:
+ args.append('--components')
+ args.append(self.settings['components'])
args += [self.settings['distribution'],
rootdir, self.settings['mirror']]
logging.debug(" ".join(args))
@@ -792,11 +800,14 @@ append initrd=%(initrd)s root=UUID=%(uuid)s ro %(kserial)s
if self.settings['apt-mirror']:
mirror = self.settings['apt-mirror']
self.message("Setting apt mirror to %s" % mirror)
+ components = 'main'
+ if self.settings['components']:
+ components = self.settings['components'].replace(',', ' ')
os.unlink(os.path.join(rootdir, 'etc', 'apt', 'sources.list'))
f = open(conf, 'w')
- line = 'deb %s %s main\n' % (mirror, self.settings['distribution'])
+ line = 'deb %s %s %s\n' % (mirror, self.settings['distribution'], components)
f.write(line)
- line = '#deb-src %s %s main\n' % (mirror, self.settings['distribution'])
+ line = '#deb-src %s %s %s\n' % (mirror, self.settings['distribution'], components)
f.write(line)
f.close()
# ensure the apt sources have valid lists
diff --git a/vmdebootstrap.8.in b/vmdebootstrap.8.in
index 80df9bc..5ca871e 100644
--- a/vmdebootstrap.8.in
+++ b/vmdebootstrap.8.in
@@ -28,7 +28,7 @@ vmdebootstrap \- install basic Debian system into virtual disk image
[\-\-customize=SCRIPT] [\-\-hostname=HOSTNAME] [\-\-user=USER/PASSWORD]
[\-\-serial-console | \-\-no-serial-console] [\-\-sudo |\-\-no-sudo] [\-\-owner=OWNER]
[\-\-bootsize=BOOTSIZE] [\-\-boottype=FSTYPE] [\-\-roottype=FSTYPE] [\-\-foreign=PATH]
-[\-\-variant=VARIANT] [\-\-no-extlinux] [\-\-squash] [\-\-configure-apt]
+[\-\-variant=VARIANT] [\-\-components=COMPONETS] [\-\-no-extlinux] [\-\-squash] [\-\-configure-apt]
[\-\-grub] [\-\-apt-mirror] [\-\-pkglist]
.SH DESCRIPTION
.B vmdebootstrap
--
2.2.1.209.g41e5f3a
