Commit b77b40c1 authored by Nikos Skalkotos's avatar Nikos Skalkotos

Merge branch 'master' into develop

Conflicts:
	docs/version.py
	version
	version.m4
parents 503edd44 d7d7934f
2016-10-4, v0.20.1
* Fix a "no properly formatted MD5 checksum lines found" bug in
snf-image-update-helper
2016-10-3, v0.20
* Add support for NetworkManager in CofigureNetwork configuration task
* Add a new Linux configuration task for regenerating the machine ID
......
......@@ -145,7 +145,7 @@ if [ "x$NO_CHECKSUM" != "xyes" ]; then
# curl will not attempt to decode %-sequences which may lead to unexpected
# filenames. It's better if we just replace the filename inside the md5sum
# file with the one we know.
sed -i 's/ .\+$/'" $IMAGE"'/' "$IMAGE_DIR/$IMAGE.md5sum"
sed -i 's/ .\+$/'" $IMAGE"'/' "$IMAGE_DIR/$IMAGE.md5sum"
$MD5SUM -c "$IMAGE_DIR/$IMAGE.md5sum"
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment