From 89a74a33c8b48457ba888d8870252932ba9d8a1e Mon Sep 17 00:00:00 2001 From: Tiago Ilieve Date: Tue, 2 Sep 2014 19:53:10 -0300 Subject: [PATCH] Fix `linux-headers` package version detection The `uname -r` command returns the version of the running kernel running on the host machine, as the chroot environment doesn't load a new one. This prevents the proper version of the `linux-headers-*` package from being added when the target has a different kernel version or architecure. This closes #121. --- .../providers/virtualbox/tasks/guest_additions.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bootstrapvz/providers/virtualbox/tasks/guest_additions.py b/bootstrapvz/providers/virtualbox/tasks/guest_additions.py index 726ef29..e4e3890 100644 --- a/bootstrapvz/providers/virtualbox/tasks/guest_additions.py +++ b/bootstrapvz/providers/virtualbox/tasks/guest_additions.py @@ -27,11 +27,11 @@ class AddGuestAdditionsPackages(Task): info.packages.add('bzip2') info.packages.add('build-essential') info.packages.add('dkms') - - from bootstrapvz.common.tools import log_check_call - [kernel_version] = log_check_call(['chroot', info.root, - 'uname', '-r']) - kernel_headers_pkg = 'linux-headers-' + kernel_version + kernel_headers_pkg = 'linux-headers-' + if info.manifest.system['architecture'] == 'i386': + kernel_headers_pkg += '686-pae' + else: + kernel_headers_pkg += 'amd64' info.packages.add(kernel_headers_pkg)