summaryrefslogtreecommitdiff
path: root/packages/bddeb
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-03-04 00:41:52 -0500
committerScott Moser <smoser@ubuntu.com>2016-03-04 00:41:52 -0500
commit3400f839651d308e495d1d8a1d7c1c2b463ad98b (patch)
tree91bb7977e00c18d955c1b5a10a366bdb94422295 /packages/bddeb
parent2231c45ac3712c5cb7c1b810c838d3f91f424bf2 (diff)
parent9b0cbf54a90d2434e2a93e34664646ee8638fc97 (diff)
downloadvyos-cloud-init-3400f839651d308e495d1d8a1d7c1c2b463ad98b.tar.gz
vyos-cloud-init-3400f839651d308e495d1d8a1d7c1c2b463ad98b.zip
systemd: support disabling cloud-init via file or kernel cmdline
This adds a systemd generator for a 'cloud-init.target'. That target will be WantedBy multi-user.target in the default case. If there is a file /etc/cloud/cloud-init.disabled or the kernel command line contains 'cloud-init=disabled' then cloud-init will not affect boot at all. There are some packages/debian changes to affect this: * postinst, preinst: these are necessary to remove some old target files for multi-user.target (LP: #1552999) * changes to include these files in the debian source package. * rules.in: supports DEB_BUILD_OPTIONS=nocheck to not run check setup.py: mostly changes to support installing the generator but also pep8 fixes along the way systemd/*: make each of the services 'WantedBy=cloud-init.target' rather than being wanted by multi-user.target
Diffstat (limited to 'packages/bddeb')
-rwxr-xr-xpackages/bddeb11
1 files changed, 6 insertions, 5 deletions
diff --git a/packages/bddeb b/packages/bddeb
index c4efe264..c141b1ab 100755
--- a/packages/bddeb
+++ b/packages/bddeb
@@ -1,5 +1,6 @@
#!/usr/bin/env python3
+import glob
import os
import shutil
import sys
@@ -105,11 +106,11 @@ def write_debian_folder(root, version, revno, pkgmap,
util.abs_join(deb_dir, 'rules'),
params={'python': python, 'pyver': pyver})
- # Just copy the following directly
- for base_fn in ['dirs', 'copyright', 'compat']:
- shutil.copy(util.abs_join(find_root(),
- 'packages', 'debian', base_fn),
- util.abs_join(deb_dir, base_fn))
+ # Just copy any other files directly (including .in)
+ pdeb_d = util.abs_join(find_root(), 'packages', 'debian')
+ for f in [os.path.join(pdeb_d, f) for f in os.listdir(pdeb_d)]:
+ if os.path.isfile(f):
+ shutil.copy(f, util.abs_join(deb_dir, os.path.basename(f)))
def main():