diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 0bf4eb82..1e009073 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -39,7 +39,7 @@ RUN echo "Acquire::http { Proxy \"$APTPROXY\"; };" >> /etc/apt/apt.conf.d/01prox ########## Dapper Configuration ##################### -ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST DEBUG APTPROXY +ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST DEBUG APTPROXY ENGINE_REGISTRY_MIRROR ENV DAPPER_DOCKER_SOCKET true ENV DAPPER_SOURCE /go/src/github.com/rancher/os ENV DAPPER_OUTPUT ./bin ./dist ./build/initrd ./build/kernel @@ -63,9 +63,9 @@ ARG DOCKER_BUILD_VERSION=1.10.3 ARG DOCKER_BUILD_PATCH_VERSION=v${DOCKER_BUILD_VERSION}-ros1 ARG SELINUX_POLICY_URL=https://github.com/rancher/refpolicy/releases/download/v0.0.3/policy.29 -ARG KERNEL_VERSION_amd64=4.9.33-rancher +ARG KERNEL_VERSION_amd64=4.9.34-rancher ARG KERNEL_URL_amd64=https://github.com/rancher/os-kernel/releases/download/v${KERNEL_VERSION_amd64}/linux-${KERNEL_VERSION_amd64}-x86.tar.gz -ARG KERNEL_URL_arm64=https://github.com/imikushin/os-kernel/releases/download/Estuary-4.4.0-arm64.8/linux-4.4.0-rancher-arm64.tar.gz +#ARG KERNEL_URL_arm64=https://github.com/imikushin/os-kernel/releases/download/Estuary-4.4.0-arm64.8/linux-4.4.0-rancher-arm64.tar.gz ARG DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz ARG DOCKER_URL_arm=https://github.com/rancher/docker/releases/download/${DOCKER_PATCH_VERSION}/docker-${DOCKER_VERSION}_arm.tgz @@ -81,9 +81,9 @@ ARG OS_SERVICES_REPO=https://raw.githubusercontent.com/${OS_REPO}/os-services ARG IMAGE_NAME=${OS_REPO}/os ARG DFS_IMAGE=${OS_REPO}/docker:v${DOCKER_VERSION}-2 -ARG OS_BASE_URL_amd64=https://github.com/rancher/os-base/releases/download/v2017.02.3-1/os-base_amd64.tar.xz -ARG OS_BASE_URL_arm64=https://github.com/rancher/os-base/releases/download/v2017.02.3-1/os-base_arm64.tar.xz -ARG OS_BASE_URL_arm=https://github.com/rancher/os-base/releases/download/v2017.02.3-1/os-base_arm.tar.xz +ARG OS_BASE_URL_amd64=https://github.com/rancher/os-base/releases/download/v2017.02.3-glibc-ssp-all/os-base_amd64.tar.xz +ARG OS_BASE_URL_arm64=https://github.com/rancher/os-base/releases/download/v2017.02.3-glibc-ssp-all/os-base_arm64.tar.xz +ARG OS_BASE_URL_arm=https://github.com/rancher/os-base/releases/download/v2017.02.3-glibc-ssp-all/os-base_arm.tar.xz ###################################################### # Set up environment and export all ARGS as ENV diff --git a/Makefile b/Makefile index 0277377b..aa07196e 100755 --- a/Makefile +++ b/Makefile @@ -58,6 +58,7 @@ rpi: # scripts/images/raspberry-pi-hypriot/dist/rancheros-raspberry-pi.zip cp dist/artifacts/rootfs_arm.tar.gz scripts/images/raspberry-pi-hypriot/ cd scripts/images/raspberry-pi-hypriot/ \ + && ../../../.dapper rpi64: # scripts/images/raspberry-pi-hypriot64/dist/rancheros-raspberry-pi.zip diff --git a/README.md b/README.md index 33f0086e..d57b02b7 100644 --- a/README.md +++ b/README.md @@ -14,40 +14,40 @@ it would really be bad if somebody did `docker rm -f $(docker ps -qa)` and delet ## Latest Release -**v1.0.2 - Docker 17.03.1-ce - Linux 4.9.30** +**v1.0.3 - Docker 17.03.1-ce - Linux 4.9.34** ### ISO - https://releases.rancher.com/os/latest/rancheros.iso -- https://releases.rancher.com/os/v1.0.2/rancheros.iso +- https://releases.rancher.com/os/v1.0.3/rancheros.iso ### Additional Downloads #### Latest Links * https://releases.rancher.com/os/latest/initrd -* https://releases.rancher.com/os/latest/initrd-v1.0.2 +* https://releases.rancher.com/os/latest/initrd-v1.0.3 * https://releases.rancher.com/os/latest/iso-checksums.txt * https://releases.rancher.com/os/latest/rancheros-openstack.img * https://releases.rancher.com/os/latest/rancheros.ipxe * https://releases.rancher.com/os/latest/rancheros.iso -* https://releases.rancher.com/os/latest/rancheros-v1.0.2.tar.gz +* https://releases.rancher.com/os/latest/rancheros-v1.0.3.tar.gz * https://releases.rancher.com/os/latest/rootfs.tar.gz * https://releases.rancher.com/os/latest/vmlinuz -* https://releases.rancher.com/os/latest/vmlinuz-4.9.30-rancher +* https://releases.rancher.com/os/latest/vmlinuz-4.9.34-rancher -#### v1.0.2 Links +#### v1.0.3 Links -* https://releases.rancher.com/os/v1.0.2/initrd -* https://releases.rancher.com/os/v1.0.2/initrd-v1.0.2 -* https://releases.rancher.com/os/v1.0.2/iso-checksums.txt -* https://releases.rancher.com/os/v1.0.2/rancheros-openstack.img -* https://releases.rancher.com/os/v1.0.2/rancheros.ipxe -* https://releases.rancher.com/os/v1.0.2/rancheros.iso -* https://releases.rancher.com/os/v1.0.2/rancheros-v1.0.2.tar.gz -* https://releases.rancher.com/os/v1.0.2/rootfs.tar.gz -* https://releases.rancher.com/os/v1.0.2/vmlinuz -* https://releases.rancher.com/os/v1.0.2/vmlinuz-4.9.40-rancher +* https://releases.rancher.com/os/v1.0.3/initrd +* https://releases.rancher.com/os/v1.0.3/initrd-v1.0.3 +* https://releases.rancher.com/os/v1.0.3/iso-checksums.txt +* https://releases.rancher.com/os/v1.0.3/rancheros-openstack.img +* https://releases.rancher.com/os/v1.0.3/rancheros.ipxe +* https://releases.rancher.com/os/v1.0.3/rancheros.iso +* https://releases.rancher.com/os/v1.0.3/rancheros-v1.0.3.tar.gz +* https://releases.rancher.com/os/v1.0.3/rootfs.tar.gz +* https://releases.rancher.com/os/v1.0.3/vmlinuz +* https://releases.rancher.com/os/v1.0.3/vmlinuz-4.9.34-rancher #### ARM Links @@ -56,10 +56,10 @@ it would really be bad if somebody did `docker rm -f $(docker ps -qa)` and delet * https://releases.rancher.com/os/latest/rancheros-raspberry-pi.zip * https://releases.rancher.com/os/latest/rancheros-raspberry-pi64.zip -* https://releases.rancher.com/os/v1.0.2/rootfs_arm.tar.gz -* https://releases.rancher.com/os/v1.0.2/rootfs_arm64.tar.gz -* https://releases.rancher.com/os/v1.0.2/rancheros-raspberry-pi.zip -* https://releases.rancher.com/os/v1.0.2/rancheros-raspberry-pi64.zip +* https://releases.rancher.com/os/v1.0.3/rootfs_arm.tar.gz +* https://releases.rancher.com/os/v1.0.3/rootfs_arm64.tar.gz +* https://releases.rancher.com/os/v1.0.3/rancheros-raspberry-pi.zip +* https://releases.rancher.com/os/v1.0.3/rancheros-raspberry-pi64.zip **Note**: you can use `http` instead of `https` in the above URLs, e.g. for iPXE. @@ -71,20 +71,20 @@ SSH keys are added to the **`rancher`** user, so you must log in using the **ran Region | Type | AMI | -------|------|------ -ap-south-1 | HVM | [ami-f68cf099](https://ap-south-1.console.aws.amazon.com/ec2/home?region=ap-south-1#launchInstanceWizard:ami=ami-f68cf099) -eu-west-2 | HVM | [ami-86e7f0e2](https://eu-west-2.console.aws.amazon.com/ec2/home?region=eu-west-2#launchInstanceWizard:ami=ami-86e7f0e2) -eu-west-1 | HVM | [ami-13f8e875](https://eu-west-1.console.aws.amazon.com/ec2/home?region=eu-west-1#launchInstanceWizard:ami=ami-13f8e875) -ap-northeast-2 | HVM | [ami-22e33f4c](https://ap-northeast-2.console.aws.amazon.com/ec2/home?region=ap-northeast-2#launchInstanceWizard:ami=ami-22e33f4c) -ap-northeast-1 | HVM | [ami-29e4e44e](https://ap-northeast-1.console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchInstanceWizard:ami=ami-29e4e44e) -sa-east-1 | HVM | [ami-a196ffcd](https://sa-east-1.console.aws.amazon.com/ec2/home?region=sa-east-1#launchInstanceWizard:ami=ami-a196ffcd) -ca-central-1 | HVM | [ami-dc2a96b8](https://ca-central-1.console.aws.amazon.com/ec2/home?region=ca-central-1#launchInstanceWizard:ami=ami-dc2a96b8) -ap-southeast-1 | HVM | [ami-d5f575b6](https://ap-southeast-1.console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchInstanceWizard:ami=ami-d5f575b6) -ap-southeast-2 | HVM | [ami-c2e2f5a1](https://ap-southeast-2.console.aws.amazon.com/ec2/home?region=ap-southeast-2#launchInstanceWizard:ami=ami-c2e2f5a1) -eu-central-1 | HVM | [ami-7d31eb12](https://eu-central-1.console.aws.amazon.com/ec2/home?region=eu-central-1#launchInstanceWizard:ami=ami-7d31eb12) -us-east-1 | HVM | [ami-3e732428](https://us-east-1.console.aws.amazon.com/ec2/home?region=us-east-1#launchInstanceWizard:ami=ami-3e732428) -us-east-2 | HVM | [ami-820f29e7](https://us-east-2.console.aws.amazon.com/ec2/home?region=us-east-2#launchInstanceWizard:ami=ami-820f29e7) -us-west-1 | HVM | [ami-d2edceb2](https://us-west-1.console.aws.amazon.com/ec2/home?region=us-west-1#launchInstanceWizard:ami=ami-d2edceb2) -us-west-2 | HVM | [ami-6d1a760d](https://us-west-2.console.aws.amazon.com/ec2/home?region=us-west-2#launchInstanceWizard:ami=ami-6d1a760d) +ap-south-1 | HVM | [ami-3576085a](https://ap-south-1.console.aws.amazon.com/ec2/home?region=ap-south-1#launchInstanceWizard:ami=ami-3576085a) +eu-west-2 | HVM | [ami-4806102c](https://eu-west-2.console.aws.amazon.com/ec2/home?region=eu-west-2#launchInstanceWizard:ami=ami-4806102c) +eu-west-1 | HVM | [ami-64b2a802](https://eu-west-1.console.aws.amazon.com/ec2/home?region=eu-west-1#launchInstanceWizard:ami=ami-64b2a802) +ap-northeast-2 | HVM | [ami-9d03dcf3](https://ap-northeast-2.console.aws.amazon.com/ec2/home?region=ap-northeast-2#launchInstanceWizard:ami=ami-9d03dcf3) +ap-northeast-1 | HVM | [ami-8bb1a7ec](https://ap-northeast-1.console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchInstanceWizard:ami=ami-8bb1a7ec) +sa-east-1 | HVM | [ami-ae1b71c2](https://sa-east-1.console.aws.amazon.com/ec2/home?region=sa-east-1#launchInstanceWizard:ami=ami-ae1b71c2) +ca-central-1 | HVM | [ami-4fa7182b](https://ca-central-1.console.aws.amazon.com/ec2/home?region=ca-central-1#launchInstanceWizard:ami=ami-4fa7182b) +ap-southeast-1 | HVM | [ami-4f921c2c](https://ap-southeast-1.console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchInstanceWizard:ami=ami-4f921c2c) +ap-southeast-2 | HVM | [ami-d64c5fb5](https://ap-southeast-2.console.aws.amazon.com/ec2/home?region=ap-southeast-2#launchInstanceWizard:ami=ami-d64c5fb5) +eu-central-1 | HVM | [ami-8c52f4e3](https://eu-central-1.console.aws.amazon.com/ec2/home?region=eu-central-1#launchInstanceWizard:ami=ami-8c52f4e3) +us-east-1 | HVM | [ami-067c4a10](https://us-east-1.console.aws.amazon.com/ec2/home?region=us-east-1#launchInstanceWizard:ami=ami-067c4a10) +us-east-2 | HVM | [ami-b74b6ad2](https://us-east-2.console.aws.amazon.com/ec2/home?region=us-east-2#launchInstanceWizard:ami=ami-b74b6ad2) +us-west-1 | HVM | [ami-04351964](https://us-west-1.console.aws.amazon.com/ec2/home?region=us-west-1#launchInstanceWizard:ami=ami-04351964) +us-west-2 | HVM | [ami-bed0c7c7](https://us-west-2.console.aws.amazon.com/ec2/home?region=us-west-2#launchInstanceWizard:ami=ami-bed0c7c7) Additionally, images are available with support for Amazon EC2 Container Service (ECS) [here](https://docs.rancher.com/os/amazon-ecs/#amazon-ecs-enabled-amis). diff --git a/docs/os/amazon-ecs/index.md b/docs/os/amazon-ecs/index.md index 4b37c683..2c8cf169 100644 --- a/docs/os/amazon-ecs/index.md +++ b/docs/os/amazon-ecs/index.md @@ -62,22 +62,22 @@ rancher: ### Amazon ECS enabled AMIs -Latest Release: [v1.0.0](https://github.com/rancher/os/releases/tag/v1.0.0) +Latest Release: [v1.0.3](https://github.com/rancher/os/releases/tag/v1.0.3) Region | Type | AMI ---|--- | --- -ap-south-1 | HVM - ECS enabled | [ami-0090ec6f](https://ap-south-1.console.aws.amazon.com/ec2/home?region=ap-south-1#launchInstanceWizard:ami=ami-0090ec6f) -eu-west-2 | HVM - ECS enabled | [ami-61fbec05](https://eu-west-2.console.aws.amazon.com/ec2/home?region=eu-west-2#launchInstanceWizard:ami=ami-61fbec05) -eu-west-1 | HVM - ECS enabled | [ami-50f2e236](https://eu-west-1.console.aws.amazon.com/ec2/home?region=eu-west-1#launchInstanceWizard:ami=ami-50f2e236) -ap-northeast-2 | HVM - ECS enabled | [ami-fbe33f95](https://ap-northeast-2.console.aws.amazon.com/ec2/home?region=ap-northeast-2#launchInstanceWizard:ami=ami-fbe33f95) -ap-northeast-1 | HVM - ECS enabled | [ami-fce2e29b](https://ap-northeast-1.console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchInstanceWizard:ami=ami-fce2e29b) -sa-east-1 | HVM - ECS enabled | [ami-bf97fed3](https://sa-east-1.console.aws.amazon.com/ec2/home?region=sa-east-1#launchInstanceWizard:ami=ami-bf97fed3) -ca-central-1 | HVM - ECS enabled | [ami-65209c01](https://ca-central-1.console.aws.amazon.com/ec2/home?region=ca-central-1#launchInstanceWizard:ami=ami-65209c01) -ap-southeast-1 | HVM - ECS enabled | [ami-75f87816](https://ap-southeast-1.console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchInstanceWizard:ami=ami-75f87816) -ap-southeast-2 | HVM - ECS enabled | [ami-2deff84e](https://ap-southeast-2.console.aws.amazon.com/ec2/home?region=ap-southeast-2#launchInstanceWizard:ami=ami-2deff84e) -eu-central-1 | HVM - ECS enabled | [ami-0a30ea65](https://eu-central-1.console.aws.amazon.com/ec2/home?region=eu-central-1#launchInstanceWizard:ami=ami-0a30ea65) -us-east-1 | HVM - ECS enabled | [ami-60742376](https://us-east-1.console.aws.amazon.com/ec2/home?region=us-east-1#launchInstanceWizard:ami=ami-60742376) -us-east-2 | HVM - ECS enabled | [ami-1b0e287e](https://us-east-2.console.aws.amazon.com/ec2/home?region=us-east-2#launchInstanceWizard:ami=ami-1b0e287e) -us-west-1 | HVM - ECS enabled | [ami-45efcc25](https://us-west-1.console.aws.amazon.com/ec2/home?region=us-west-1#launchInstanceWizard:ami=ami-45efcc25) -us-west-2 | HVM - ECS enabled | [ami-811b77e1](https://us-west-2.console.aws.amazon.com/ec2/home?region=us-west-2#launchInstanceWizard:ami=ami-811b77e1) +ap-south-1 | HVM - ECS enabled | [ami-f7770998](https://ap-south-1.console.aws.amazon.com/ec2/home?region=ap-south-1#launchInstanceWizard:ami=ami-f7770998) +eu-west-2 | HVM - ECS enabled | [ami-f4041290](https://eu-west-2.console.aws.amazon.com/ec2/home?region=eu-west-2#launchInstanceWizard:ami=ami-f4041290) +eu-west-1 | HVM - ECS enabled | [ami-66b2a800](https://eu-west-1.console.aws.amazon.com/ec2/home?region=eu-west-1#launchInstanceWizard:ami=ami-66b2a800) +ap-northeast-2 | HVM - ECS enabled | [ami-9e03dcf0](https://ap-northeast-2.console.aws.amazon.com/ec2/home?region=ap-northeast-2#launchInstanceWizard:ami=ami-9e03dcf0) +ap-northeast-1 | HVM - ECS enabled | [ami-32b1a755](https://ap-northeast-1.console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchInstanceWizard:ami=ami-32b1a755) +sa-east-1 | HVM - ECS enabled | [ami-e01f758c](https://sa-east-1.console.aws.amazon.com/ec2/home?region=sa-east-1#launchInstanceWizard:ami=ami-e01f758c) +ca-central-1 | HVM - ECS enabled | [ami-cca619a8](https://ca-central-1.console.aws.amazon.com/ec2/home?region=ca-central-1#launchInstanceWizard:ami=ami-cca619a8) +ap-southeast-1 | HVM - ECS enabled | [ami-d79618b4](https://ap-southeast-1.console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchInstanceWizard:ami=ami-d79618b4) +ap-southeast-2 | HVM - ECS enabled | [ami-7d4a591e](https://ap-southeast-2.console.aws.amazon.com/ec2/home?region=ap-southeast-2#launchInstanceWizard:ami=ami-7d4a591e) +eu-central-1 | HVM - ECS enabled | [ami-f653f599](https://eu-central-1.console.aws.amazon.com/ec2/home?region=eu-central-1#launchInstanceWizard:ami=ami-f653f599) +us-east-1 | HVM - ECS enabled | [ami-3a71472c](https://us-east-1.console.aws.amazon.com/ec2/home?region=us-east-1#launchInstanceWizard:ami=ami-3a71472c) +us-east-2 | HVM - ECS enabled | [ami-51466734](https://us-east-2.console.aws.amazon.com/ec2/home?region=us-east-2#launchInstanceWizard:ami=ami-51466734) +us-west-1 | HVM - ECS enabled | [ami-b70f23d7](https://us-west-1.console.aws.amazon.com/ec2/home?region=us-west-1#launchInstanceWizard:ami=ami-b70f23d7) +us-west-2 | HVM - ECS enabled | [ami-3ad2c543](https://us-west-2.console.aws.amazon.com/ec2/home?region=us-west-2#launchInstanceWizard:ami=ami-3ad2c543) diff --git a/docs/os/security/index.md b/docs/os/security/index.md index 5030d113..7341d728 100644 --- a/docs/os/security/index.md +++ b/docs/os/security/index.md @@ -31,5 +31,6 @@ layout: os-default |----|-------------|------|------------| | [CVE-2017-6074](http://seclists.org/oss-sec/2017/q1/471) | Local privilege-escalation using a user after free issue in [Datagram Congestion Control Protocol (DCCP)](https://wiki.linuxfoundation.org/networking/dccp). DCCP is built into the RancherOS kernel as a dynamically loaded module, and isn't loaded by default. | 17 Feb 2017 | [RancherOS v0.8.1](https://github.com/rancher/os/releases/tag/v0.8.1) using a [patched 4.9.12 Linux kernel](https://github.com/rancher/os-kernel/releases/tag/v4.9.12-rancher) | | [CVE-2017-7184](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7184) | Allows local users to obtain root privileges or cause a denial of service (heap-based out-of-bounds access) by leveraging the CAP_NET_ADMIN capability. | 3 April 2017 | [RancherOS v0.9.2-rc1](https://github.com/rancher/os/releases/tag/v0.9.2-rc1) using Linux 4.9.20 | - +| [CVE-2017-1000364](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-1000364) | Linux Kernel is prone to a local memory-corruption vulnerability. Attackers may be able to exploit this issue to execute arbitrary code with elevated privileges | 19 June 2017 | [RancherOS v1.0.3](https://github.com/rancher/os/releases/tag/v1.0.3) | +| [CVE-2017-1000366](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-1000366) | glibc contains a vulnerability that allows manipulation of the heap/stack. Attackers may be able to exploit this issue to execute arbitrary code with elevated privileges | 19 June 2017 | [RancherOS v1.0.3](https://github.com/rancher/os/releases/tag/v1.0.3) | diff --git a/scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper b/scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper index 137c6bec..5487c4f0 100644 --- a/scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper +++ b/scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper @@ -12,12 +12,12 @@ RUN mkdir -p /source/assets #RUN curl -fL https://releases.rancher.com/os/latest/rootfs_arm64.tar.gz > /source/assets/rootfs_arm64.tar.gz COPY rootfs_arm64.tar.gz /source/assets/rootfs_arm64.tar.gz -ENV URL=https://github.com/DieterReuter/rpi64-kernel/releases/download -ENV VER=v20170303-160601 +ENV URL=https://github.com/SvenDowideit/rpi64-kernel/releases/download +ENV VER=v20170626-014036 -RUN curl -fL ${URL}/${VER}/4.9.13-bee42-v8.tar.gz > /source/assets/kernel.tar.gz +RUN curl -fL ${URL}/${VER}/4.9.34-bee42-v8.tar.gz > /source/assets/kernel.tar.gz RUN curl -fL ${URL}/${VER}/bootfiles.tar.gz > /source/assets/bootfiles.tar.gz -RUN curl -fL https://github.com/DieterReuter/rpi-bootloader/releases/download/v20170303-133934/rpi-bootloader.tar.gz > /source/assets/rpi-bootfiles.tar.gz +RUN curl -fL https://github.com/SvenDowideit/rpi-bootloader/releases/download/v20170622-085322/rpi-bootloader.tar.gz > /source/assets/rpi-bootfiles.tar.gz #ENV RPI_URL=https://github.com/raspberrypi/firmware/raw/master/boot #RUN curl -fL ${RPI_URL}/bootcode.bin > /source/assets/bootcode.bin diff --git a/tests/cmdline_test.go b/tests/cmdline_test.go index d15afc23..04c9c1ff 100755 --- a/tests/cmdline_test.go +++ b/tests/cmdline_test.go @@ -19,7 +19,7 @@ func (s *QemuSuite) TestElideCmdLine(c *C) { s.RunQemuWith(c, runArgs...) s.CheckOutput(c, "nope\n", Equals, "hostname") - cmdline := s.CheckOutput(c, "", Not(Equals), "cat /proc/cmdline",) + cmdline := s.CheckOutput(c, "", Not(Equals), "cat /proc/cmdline") if strings.Contains(cmdline, extra) { c.Errorf("/proc/cmdline (%s) contains info that should be elided (%s)", cmdline, extra) }