diff options
| author | Neil Williams <codehelp@debian.org> | 2016-07-17 16:54:39 +0100 |
|---|---|---|
| committer | Neil Williams <codehelp@debian.org> | 2016-07-17 16:54:39 +0100 |
| commit | 6365864a7b6a4b08b4d95ef0bc8148ed1fca1bcb (patch) | |
| tree | c5974c5f0b068dc47aec9864a2dade032e22a8e7 | |
| parent | 1e2e196ee9d07c53a039f72994ab70dd562b0a91 (diff) | |
| download | vmdebootstrap-6365864a7b6a4b08b4d95ef0bc8148ed1fca1bcb.tar.gz | |
Disable ext4 on wheezy
| -rwxr-xr-x | bin/vmdebootstrap | 8 | ||||
| -rw-r--r-- | yarns/200-fast-tests.yarn | 9 |
2 files changed, 15 insertions, 2 deletions
diff --git a/bin/vmdebootstrap b/bin/vmdebootstrap index 38d647c..97666d8 100755 --- a/bin/vmdebootstrap +++ b/bin/vmdebootstrap @@ -181,6 +181,12 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth raise cliapp.AppException( 'Disabling systemd-networkd for jessie and later ' 'requires updating the initramfs.') + else: + if self.settings['roottype'] == 'ext4': + raise cliapp.AppException( + 'Wheezy images using ext4 will not be able to boot. ' + 'Please use --roottype ext2 or --roottype ext3' + ) if self.settings['roottype'] == 'btrfs' and\ self.settings['extlinux'] and not self.settings['grub']: @@ -233,7 +239,7 @@ class VmDebootstrap(cliapp.Application): # pylint: disable=too-many-public-meth if self.settings['bootflag']: base.message("Setting '%s' flag on first partition." % self.settings['bootflag']) runcmd(['parted', '-s', self.settings['image'], - 'set', '1', self.settings['bootflag'], 'on']) + 'set', '1', self.settings['bootflag'], 'on']) def _image_operations(self, rootdir, rootdev): if not self.settings['image']: diff --git a/yarns/200-fast-tests.yarn b/yarns/200-fast-tests.yarn index 92f543f..db177cc 100644 --- a/yarns/200-fast-tests.yarn +++ b/yarns/200-fast-tests.yarn @@ -95,7 +95,7 @@ verify that vmdebootstrap parses the command line correctly. SCENARIO disallow UEFI support on wheezy except on amd64 ASSUMING fast tests are requested WHEN user attempts to run vmdebootstrap - ... --image=FOO --grub --use-uefi --distribution=wheezy --arch=arm64 --dry-run + ... --image=FOO --grub --use-uefi --roottype=ext2 --distribution=wheezy --arch=arm64 --dry-run THEN vmdebootstrap exited with a non-zero exit code AND vmdebootstrap wrote an error message matching Only amd64 AND vmdebootstrap wrote an error message matching supports UEFI @@ -196,3 +196,10 @@ verify that vmdebootstrap parses the command line correctly. THEN vmdebootstrap exited with a non-zero exit code AND vmdebootstrap wrote an error message matching bootflag AND vmdebootstrap wrote an error message matching requires an argument + + SCENARIO wheezy image does not support ext4 + ASSUMING fast tests are requested + WHEN user attempts to run vmdebootstrap + ... --image=FOO --roottype ext4 --dry-run --distribution wheezy + THEN vmdebootstrap exited with a non-zero exit code + AND vmdebootstrap wrote an error message matching Wheezy images using ext4 will not be able to boot |