Default to armmp kernel for armhf architecture.

[forks/vmdebootstrap.git] / vmdebootstrap

diff --git a/vmdebootstrap b/vmdebootstrap
index 1a96a14cd7958abfc51e8a2531449344c45a27bc..4d0ce90bbf6c16d18f18de99a03f983d72d5e2d7 100755 (executable)
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -27,7 +27,7 @@ import tempfile
 import time
 
 
-__version__ = '0.6'
+__version__ = '0.7'
 
 # pylint: disable=invalid-name
 
@@ -248,7 +248,7 @@ class VmDebootstrap(cliapp.Application):  # pylint: disable=too-many-public-meth
 
             if self.settings['owner']:
                 self.chown()
-        except BaseException, e:
+        except BaseException as e:
             self.message('EEEK! Something bad happened...')
             if rootdir:
                 db_log = os.path.join(rootdir, 'debootstrap', 'debootstrap.log')
@@ -418,11 +418,13 @@ class VmDebootstrap(cliapp.Application):  # pylint: disable=too-many-public-meth
             include.append('acpid')
 
         if self.settings['grub']:
-            include.append('grub2')
+            include.append('grub-pc')
 
         if not self.settings['no-kernel']:
             if self.settings['arch'] == 'i386':
                 kernel_arch = '486'
+            elif self.settings['arch'] == 'armhf':
+                kernel_arch = 'armmp'
             else:
                 kernel_arch = self.settings['arch']
             kernel_image = 'linux-image-%s' % kernel_arch