Let acpid be omitted

Debian Bug: #784638

diff --git a/vmdebootstrap b/vmdebootstrap
index add3d44165bfd3b1ea14a8a52fb79709b787f8c9..bc5b887b97ebfe6f127310e31dffc925aff86bd6 100755 (executable)
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -184,6 +184,10 @@ class VmDebootstrap(cliapp.Application):  # pylint: disable=too-many-public-meth
         self.settings.boolean(
             ['pkglist'],
             'Create a list of package names included in the image.')
+        self.settings.boolean(
+            ['no-acpid'],
+            'do not install the acpid package',
+            default=False)
 
     def process_args(self, args):  # pylint: disable=too-many-branches,too-many-statements
         if not self.settings['image'] and not self.settings['tarball']:
@@ -448,7 +452,7 @@ class VmDebootstrap(cliapp.Application):  # pylint: disable=too-many-public-meth
 
         include = self.settings['package']
 
-        if not self.settings['foreign']:
+        if not self.settings['foreign'] and not self.settings['no-acpid']:
             include.append('acpid')
 
         if self.settings['grub']:

diff --git a/vmdebootstrap.8.in b/vmdebootstrap.8.in
index aecc792454670b7d9dfcef5aa1bd0e5cbdcd713a..34dfe024c0a78f3f324c924d094c036e98185335 100644 (file)
--- a/vmdebootstrap.8.in
+++ b/vmdebootstrap.8.in
@@ -233,6 +233,9 @@ available.
 Disable extlinux installation and configure grub2 instead. grub2 will be added to
 the list of packages to install. update-grub will be called once the debootstrap is
 complete and grub-install will be called in the image.
+.IP \-\-no\-acpid
+Disable installation of acpid if not required, otherwise acpid will be
+installed if \-\-foreign is not used.
 .IP \-\-pkglist
 Output a list of package names installed inside the image. Useful if you
 need to track the relevant source packages used inside the image for