diff options
| author | Neil Williams <codehelp@debian.org> | 2016-07-31 22:23:18 +0100 |
|---|---|---|
| committer | Neil Williams <codehelp@debian.org> | 2016-07-31 22:23:18 +0100 |
| commit | 479f2395ba42813e284a15e442c38b8536155ce8 (patch) | |
| tree | c49d7d93f896a2285fecc7d9d14cd21a2ab7370a /vmdebootstrap | |
| parent | 5c0f1d11fb1bdeceffc0aa28e19673c82663a9ab (diff) | |
| download | vmdebootstrap-479f2395ba42813e284a15e442c38b8536155ce8.tar.gz | |
Update and expand the build tests
Still issues to fix with some of the scenarios
Diffstat (limited to 'vmdebootstrap')
| -rw-r--r-- | vmdebootstrap/filesystem.py | 2 | ||||
| -rw-r--r-- | vmdebootstrap/grub.py | 3 |
2 files changed, 3 insertions, 2 deletions
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 [] |