From afc8b52fd8cc49c5da802f628076cc7df953cb8c Mon Sep 17 00:00:00 2001 From: Matt Rickard Date: Mon, 28 Aug 2017 10:43:32 -0700 Subject: [PATCH] Change cleanup command to accomodate swap disk Hyperkit was mounting swap disks, which we can't detach with the hdiutil util like we're using. Its sufficient to just hdiutil detach /dev/disk1 ``` /dev/disk1 FDisk_partition_scheme /dev/disk1s1 Linux /dev/disk1s2 Linux_Swap ``` --- hack/jenkins/common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 5123e06ea0..9fca597295 100644 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -52,8 +52,8 @@ vboxmanage list vms \ # Clean up xhyve disks hdiutil info \ - | grep -v /dev/disk0 \ - | grep /dev/ \ + | egrep \/dev\/disk[1-9][^s] \ + | awk '{print $1}' \ | xargs -I {} sh -c "hdiutil detach {}" \ || true