From 479f2395ba42813e284a15e442c38b8536155ce8 Mon Sep 17 00:00:00 2001 From: Neil Williams Date: Sun, 31 Jul 2016 22:23:18 +0100 Subject: Update and expand the build tests Still issues to fix with some of the scenarios --- vmdebootstrap/filesystem.py | 2 +- vmdebootstrap/grub.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'vmdebootstrap') diff --git a/vmdebootstrap/filesystem.py b/vmdebootstrap/filesystem.py index d878d73..b911c05 100644 --- a/vmdebootstrap/filesystem.py +++ b/vmdebootstrap/filesystem.py @@ -120,7 +120,7 @@ class Filesystem(Base): for line in out.splitlines() if line.decode('utf-8').startswith('add map ')] if len(devices) != parts: - msg = 'Surprising number of partitions - check output of losetup -a' + msg = 'Surprising number of partitions %d:%d- check output of losetup -a' % (len(devices), parts) logging.debug("%s", runcmd(['losetup', '-a'])) logging.debug("%s: devices=%s parts=%s", msg, devices, parts) raise cliapp.AppException(msg) diff --git a/vmdebootstrap/grub.py b/vmdebootstrap/grub.py index 5c50b12..ad9f293 100644 --- a/vmdebootstrap/grub.py +++ b/vmdebootstrap/grub.py @@ -147,5 +147,6 @@ class GrubHandler(Base): def grub_packages(self): if self.settings['grub'] and not self.settings['use-uefi']: - return ['grub-pc'] + if self.settings['arch'] in ['i386', 'amd64']: + return ['grub-pc'] return [] -- cgit v1.2.1