diff options
| author | Neil Williams <codehelp@debian.org> | 2016-01-23 17:15:23 +0000 |
|---|---|---|
| committer | Neil Williams <codehelp@debian.org> | 2016-01-23 17:15:23 +0000 |
| commit | a7fb7ae762dd713a8212a42587583cf1b638e80e (patch) | |
| tree | 48f14362d8e0ad6c5793422eccf1a42d7a293167 | |
| parent | 57ed283dc22e650e87293854cea6f5a4e4fa9e6c (diff) | |
| download | vmdebootstrap-a7fb7ae762dd713a8212a42587583cf1b638e80e.tar.gz | |
Fail if extlinux requested with btrfs
| -rwxr-xr-x | bin/vmdebootstrap | 4 | ||||
| -rw-r--r-- | yarns/300-slow-build-tests.yarn | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/bin/vmdebootstrap b/bin/vmdebootstrap index 0fbd91e..30fca9d 100755 --- a/bin/vmdebootstrap +++ b/bin/vmdebootstrap @@ -174,6 +174,10 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth 'Disabling systemd-networkd for jessie and later ' 'requires updating the initramfs.') + if self.settings['roottype'] == 'btrfs' and\ + self.settings['extlinux']: + raise cliapp.AppException( + 'extlinux is not yet supported on btrfs. Use grub.') uefi = self.handlers[Uefi.name] oldstable = distro.was_oldstable(datetime.date(2015, 4, 26)) uefi.check_settings(oldstable=oldstable) diff --git a/yarns/300-slow-build-tests.yarn b/yarns/300-slow-build-tests.yarn index 74d999f..a76a27c 100644 --- a/yarns/300-slow-build-tests.yarn +++ b/yarns/300-slow-build-tests.yarn @@ -39,10 +39,10 @@ These tests are slow, since building images is slow. AND partition 1 has an vfat filesystem AND partition 2 has file /boot/grub/grub.cfg matching ^### BEGIN /etc/grub.d/00_header ###$ - SCENARIO build a Debian 8 image with btrfs + SCENARIO build a Debian 8 image with btrfs and grub ASSUMING build tests are requested GIVEN user wants to build an image FOO.img that is 2GiB in size - WHEN the user runs vmdebootstrap --roottype=btrfs + WHEN the user runs vmdebootstrap --roottype=btrfs --grub THEN the image has the correct size AND the partition count of the image is 1 AND partition 1 has the boot flag set |