Commit 8d155e56 authored by Ophélie Gagnard's avatar Ophélie Gagnard

installation: Clean the code.

parent 5876d0c3
...@@ -6,11 +6,15 @@ set -e ...@@ -6,11 +6,15 @@ set -e
GIT_ROOT=`git rev-parse --show-toplevel` GIT_ROOT=`git rev-parse --show-toplevel`
cd "$GIT_ROOT"/installation cd "$GIT_ROOT"/installation
source 00env.sh
# useful tools # useful tools
apt -y install sudo wget tree pip apt -y install sudo wget tree pip
git config --global user.email "ophelie.gagnard@nexedi.com" git config --global user.email "ophelie.gagnard@nexedi.com"
git config --global user.name "Ophelie Gagnard" git config --global user.name "Ophelie Gagnard"
# the next line should be enabled when the following is merged and an egg containing the changes is released:
# https://lab.nexedi.com/nexedi/slapos.libnetworkcache/merge_requests/8
#pip install slapos.libnetworkcache #pip install slapos.libnetworkcache
NC_BRANCH=cmdline-selection NC_BRANCH=cmdline-selection
NC_DIR="${NC_BRANCH}"_slapos.libnetworkcache # NC for NetworkCache NC_DIR="${NC_BRANCH}"_slapos.libnetworkcache # NC for NetworkCache
......
...@@ -52,10 +52,6 @@ networkcache-download --config ../tls-access-to-shacache/test.cfg --key river "t ...@@ -52,10 +52,6 @@ networkcache-download --config ../tls-access-to-shacache/test.cfg --key river "t
image_hash=$(sha512sum "$tmp_image_name" | cut -d' ' -f1) image_hash=$(sha512sum "$tmp_image_name" | cut -d' ' -f1)
mv "$tmp_image_name" "$image_hash" mv "$tmp_image_name" "$image_hash"
echo image_hash = "$image_hash" echo image_hash = "$image_hash"
# WGET DOWNLOADING METHOD
#if [ ! -f "$image_hash" ]; then
# wget "$shacache_url/$image_hash"
#fi
mkdir -p /boot/efi/"$RELATIVE_EFI_IMAGE_DIR" mkdir -p /boot/efi/"$RELATIVE_EFI_IMAGE_DIR"
cp "$image_hash" /boot/efi/"$RELATIVE_EFI_IMAGE_DIR" cp "$image_hash" /boot/efi/"$RELATIVE_EFI_IMAGE_DIR"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
set -e set -e
# get the root of the git repository (requires git to be installed) # get the root of the git repository (requires git to be installed)
GIT_ROOT=`git rev-parse --show-toplevel` GIT_ROOT=$(git rev-parse --show-toplevel)
cd $GIT_ROOT cd $GIT_ROOT
# define useful variables # define useful variables
......
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