Merge pull request #428 from tpepper/cnci_scripting

ciao-cnci-agent: minor fixups
ciao-project · Aug 4, 2016 · f857ab7 · f857ab7
2 parents dd98c89 + 8a95ad8
commit f857ab7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/networking/ciao-cnci-agent/scripts/README.md b/networking/ciao-cnci-agent/scripts/README.md
@@ -26,10 +26,12 @@ the certificates it needs to connect to the ciao-scheduler.
 ```
 	cd $GOPATH/src/github.com/01org/ciao/networking/ciao-cnci-agent
    	go install
+3. Download the appropriate version image and run the modification script:
 ```
-3. Update the image
-```
-./generate_cnci_cloud_image.sh --image <cnci-image>
+	cd scripts
+	curl -O https://download.clearlinux.org/demos/ciao/clear-${VERSION}-ciao-networking.img.xz
+	xz --decompress clear-${VERSION}-ciao-networking.img.xz
+	./generate_cnci_cloud_image.sh --image clear-${VERSION}-ciao-networking.img
 ```
 
 This will yield a provisioned image. This can be used as a CNCI VM.

diff --git a/networking/ciao-cnci-agent/scripts/generate_cnci_cloud_image.sh b/networking/ciao-cnci-agent/scripts/generate_cnci_cloud_image.sh
@@ -62,6 +62,7 @@ retry=0
 until [ $retry -ge 3 ]
 do
 	sudo udevadm settle
+	sudo partprobe /dev/nbd0
 	sudo mount /dev/nbd0p$partition "$tmpdir" && break
 	let retry=retry+1
 	echo "Mount failed, retrying $retry"