summaryrefslogtreecommitdiff
path: root/vmdebootstrap
diff options
context:
space:
mode:
authorNeil Williams <codehelp@debian.org>2014-08-26 13:46:57 -0700
committerNeil Williams <codehelp@debian.org>2014-08-26 13:46:57 -0700
commita0db57468c797f7a7efb086af68e886bb0e46bd4 (patch)
tree8a19c1fc603376dae73aa0736f162428e554d7fb /vmdebootstrap
parent7d44f8bbab3383d4b10ead404def7d9546707ce6 (diff)
downloadvmdebootstrap-a0db57468c797f7a7efb086af68e886bb0e46bd4.tar.gz
Let configure-apt be optional to prevent duplicate apt sources on native.
Diffstat (limited to 'vmdebootstrap')
-rwxr-xr-xvmdebootstrap9
1 files changed, 5 insertions, 4 deletions
diff --git a/vmdebootstrap b/vmdebootstrap
index 67187f4..d7edde2 100755
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -156,7 +156,8 @@ class VmDebootstrap(cliapp.Application):
self.create_users(rootdir)
self.remove_udev_persistent_rules(rootdir)
self.setup_networking(rootdir)
- self.configure_apt(rootdir)
+ if self.settings['configure-apt']:
+ self.configure_apt(rootdir)
self.customize(rootdir)
if self.settings['image']:
if self.settings['extlinux']:
@@ -560,9 +561,9 @@ append initrd=%(initrd)s root=UUID=%(uuid)s ro %(kserial)s
logging.debug('configure apt %s' % conf)
f = open(conf, 'w')
f.write('''
- deb %(mirror)s %(distribution)s main
- #deb-src %(mirror)s %(distribution)s main
- ''' % {
+deb %(mirror)s %(distribution)s main
+#deb-src %(mirror)s %(distribution)s main
+''' % {
'mirror': self.settings['mirror'],
'distribution': self.settings['distribution']
})