diff options
| author | dann frazier <dann.frazier@canonical.com> | 2014-04-29 10:14:33 -0600 |
|---|---|---|
| committer | dann frazier <dann.frazier@canonical.com> | 2014-04-29 10:14:33 -0600 |
| commit | 085bbc32fe5622878fe4846d2819186f8739f7d2 (patch) | |
| tree | 0dfc8ace0ddd0bf086a4bb8c3219aa7f54531df2 | |
| parent | 76e0a79c93706a7476aa0bb8a7e674911b756a2a (diff) | |
Use built-in uname function instead of exec'ing a binary
This also fixes an issue where we had an extra end-of-line character in the -dtb parameter.
| -rwxr-xr-x | bin/virtualization | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/virtualization b/bin/virtualization index bd1ba1c..4d292db 100755 --- a/bin/virtualization +++ b/bin/virtualization @@ -120,7 +120,7 @@ class KVMTest(object): cloud_disk = "-drive file=seed.iso,if=virtio" if self.arch == 'armhf': - uname = check_output(['uname', '-r'], universal_newlines=True) + uname = os.uname()[2] cloud_disk = cloud_disk.replace("virtio", "sd") params = 'qemu-system-arm -machine vexpress-a15 -cpu cortex-a15 -enable-kvm -m {} -kernel /boot/vmlinuz -append "console=ttyAMA0 earlyprintk=serial root=/dev/mmcblk0 ro rootfstype=ext4" -serial stdio -dtb /lib/firmware/{}/device-tree/vexpress-v2p-ca15-tc1.dtb -initrd /boot/initrd.img -net nic -net user,net={},host={},hostfwd={} -drive file={},if=sd,cache=writeback {} -display none -nographic'.format("256", uname, netrange, image_ip, hostfwd, data_disk, cloud_disk) else: |
