Fix kernel package names

[forks/vmdebootstrap.git] / vmdebootstrap

diff --git a/vmdebootstrap b/vmdebootstrap
index b675b22599e2f0ba92debb3c0c415d36dbc7e567..ea5edff6784ddacc49ba8a54e171f67c5b49450e 100755 (executable)
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Copyright 2011, 2012, 2013  Lars Wirzenius
+# Copyright 2011, 2012  Lars Wirzenius
 # Copyright 2012  Codethink Limited
 # 
 # This program is free software: you can redistribute it and/or modify
@@ -92,6 +92,7 @@ class VmDebootstrap(cliapp.Application):
             if self.settings['image']:
                 self.create_empty_image()
                 self.partition_image()
+                self.install_mbr()
                 rootdev = self.setup_kpartx()
                 self.mkfs(rootdev)
                 rootdir = self.mount(rootdev)
@@ -164,6 +165,10 @@ class VmDebootstrap(cliapp.Application):
         self.runcmd(['parted', '-s', self.settings['image'],
                      'set', '1', 'boot', 'on'])
 
+    def install_mbr(self):
+        self.message('Installing MBR')
+        self.runcmd(['install-mbr', self.settings['image']])
+
     def setup_kpartx(self):
         out = self.runcmd(['kpartx', '-av', self.settings['image']])
         devices = [line.split()[2]
@@ -180,21 +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)