From: Neil Williams <codehelp@debian.org>
Date: Sat, 2 May 2015 19:33:27 +0000 (+0100)
Subject: Exclude syslinux support when using grub
X-Git-Url: https://git.siccegge.de//index.cgi?a=commitdiff_plain;h=94d2cded1ec9cb98a2f1f9b0fe34d64fec1cc1f9;p=forks%2Fvmdebootstrap.git

Exclude syslinux support when using grub

Fall back to syslinux support if grub2 fails.
---

diff --git a/vmdebootstrap b/vmdebootstrap
index 8d90dd4..1b863e8 100755
--- a/vmdebootstrap
+++ b/vmdebootstrap
@@ -629,10 +629,10 @@ class VmDebootstrap(cliapp.Application):  # pylint: disable=too-many-public-meth
             self.runcmd(['chroot', rootdir, 'grub-install', install_dev])
         except cliapp.AppException:
             self.message("Failed. Is grub2-common installed? Using extlinux.")
+            self.install_extlinux(rootdev, rootdir)
         self.runcmd(['umount', os.path.join(rootdir, 'sys')])
         self.runcmd(['umount', os.path.join(rootdir, 'proc')])
         self.runcmd(['umount', os.path.join(rootdir, 'dev')])
-        self.install_extlinux(rootdev, rootdir)
 
     def install_extlinux(self, rootdev, rootdir):
         if not os.path.exists("/usr/bin/extlinux"):