Fix kernel package names

[forks/vmdebootstrap.git] / vmdebootstrap

diff --git a/vmdebootstrap b/vmdebootstrap
index 7169a5f723f188d80abf8b89d95b70ff821e4d36..ea5edff6784ddacc49ba8a54e171f67c5b49450e 100755 (executable)
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -185,22 +185,24 @@ class VmDebootstrap(cliapp.Application):
     def debootstrap(self, rootdir):
         self.message('Debootstrapping')
 
+        necessary_packages = ['acpid']
+
         include = self.settings['package']
 
         if not self.settings['no-kernel']:
             if self.settings['arch'] == 'i386':
-                kernel_arch = '686'
+                kernel_arch = '486'
             else:
                 kernel_arch = self.settings['arch']
-            kernel_image = 'linux-image-2.6-%s' % kernel_arch
+            kernel_image = 'linux-image-%s' % kernel_arch
             include.append(kernel_image)
 
         if self.settings['sudo'] and 'sudo' not in include:
             include.append('sudo')
 
         args = ['debootstrap', '--arch=%s' % self.settings['arch']]
-        if include:
-            args.append('--include=%s' % ','.join(include))
+        args.append(
+            '--include=%s' % ','.join(necessary_packages + include))
         args += [self.settings['distribution'],
                  rootdir, self.settings['mirror']]
         self.runcmd(args)