diff options
| author | Petter Reinholdtsen <pere@hungry.com> | 2014-11-09 22:16:22 +0100 |
|---|---|---|
| committer | Petter Reinholdtsen <pere@hungry.com> | 2014-11-09 22:16:22 +0100 |
| commit | 7787442526a9f9bb6d2b05d10d054134836c243a (patch) | |
| tree | 3282e9b37d7b63a624b421c0a3144b92203a607b | |
| parent | 7896e2e65a0051525a04a7bc4e43ddeba0cb6d12 (diff) | |
Use better grub patch from Sunil to fix bug #767913.
| -rw-r--r-- | vendor-patches/vmdebootstrap/02-parted-grub-space-bootspace-bts-767913.patch | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/vendor-patches/vmdebootstrap/02-parted-grub-space-bootspace-bts-767913.patch b/vendor-patches/vmdebootstrap/02-parted-grub-space-bootspace-bts-767913.patch index b91fdbb..8756aa0 100644 --- a/vendor-patches/vmdebootstrap/02-parted-grub-space-bootspace-bts-767913.patch +++ b/vendor-patches/vmdebootstrap/02-parted-grub-space-bootspace-bts-767913.patch @@ -1,26 +1,21 @@ diff --git a/vmdebootstrap b/vmdebootstrap -index 126475f..4712975 100755 +index 126475f..a32c8f4 100755 --- a/vmdebootstrap +++ b/vmdebootstrap -@@ -243,13 +243,14 @@ class VmDebootstrap(cliapp.Application): +@@ -242,10 +242,12 @@ class VmDebootstrap(cliapp.Application): + self.message('Creating partitions') self.runcmd(['parted', '-s', self.settings['image'], 'mklabel', 'msdos']) ++ # Start at 0% instead of 0 to allow parted to leave 1MiB for ++ # GRUB if self.settings['bootsize'] and self.settings['bootsize'] is not '0%': -- bootsize = str(self.settings['bootsize'] / (1024 * 1024)) -+ reserved = 1 # MiB space for boot loader / grub -+ bootend = str(reserved + (self.settings['bootsize'] / (1024 * 1024))) + bootsize = str(self.settings['bootsize'] / (1024 * 1024)) self.runcmd(['parted', '-s', self.settings['image'], - 'mkpart', 'primary', 'fat16', '0', bootsize]) -+ 'mkpart', 'primary', 'fat16', str(reserved), bootend]) ++ 'mkpart', 'primary', 'fat16', '0%', bootsize]) else: -- bootsize = '0%' -+ bootend = '0%' + bootsize = '0%' self.runcmd(['parted', '-s', self.settings['image'], -- 'mkpart', 'primary', bootsize, '100%']) -+ 'mkpart', 'primary', bootend, '100%']) - self.runcmd(['parted', '-s', self.settings['image'], - 'set', '1', 'boot', 'on']) - @@ -486,6 +487,7 @@ class VmDebootstrap(cliapp.Application): self.runcmd(['chroot', rootdir, 'update-grub']) self.runcmd(['chroot', rootdir, 'grub-install', install_dev]) |
