installation: Update slapos.libnetworkcache installation and download syntax.

installation/10install-dependencies.sh

@@ -7,19 +7,19 @@ GIT_ROOT=`git rev-parse --show-toplevel`
 cd "$GIT_ROOT"/installation
 
 # useful tools
-apt -y install sudo wget tree
+apt -y install sudo wget tree pip
 git config --global user.email "ophelie.gagnard@nexedi.com"
 git config --global user.name "Ophelie Gagnard"
 
 #pip install slapos.libnetworkcache
-NC_DIR=strategies_slapos.libnetworkcache # NC for NetworkCache
+NC_BRANCH=cmdline-selection
+NC_DIR="${NC_BRANCH}"_slapos.libnetworkcache # NC for NetworkCache
 cd ..
 if [ ! -d "$NC_DIR" ]; then
 	git clone https://lab.nexedi.com/Ophelie/slapos.libnetworkcache.git "$NC_DIR"
 	cd "$NC_DIR"
-	git checkout strategies
+	git checkout "$NC_BRANCH"
 	cd ..
 	pip install -e "$NC_DIR"
 fi
-pip install packaging
 cd installation

installation/20install-image.sh

@@ -48,7 +48,7 @@ RELATIVE_EFI_IMAGE_DIR=/EFI/Linux
 
 # NETWORKCACHE DOWNLOADING METHOD
 tmp_image_name=image_tmp.efi
-networkcache-download --config ../tls-access-to-shacache/test.cfg --id river -s most_recent > "$tmp_image_name"
+networkcache-download --config ../tls-access-to-shacache/test.cfg --id river timestamp:max > "$tmp_image_name"
 image_hash=$(sha512sum "$tmp_image_name" | cut -d' ' -f1)
 mv "$tmp_image_name" "$image_hash"
 # WGET DOWNLOADING METHOD