Commit 46d9f928 authored by Lorenzo Martinico's avatar Lorenzo Martinico

Pick up variable esacping again

This reverts commit 86621c9d.

Conflicts:
	software/nayuos/instance.cfg
	software/nayuos/software.cfg
parent d83f8ca4
...@@ -99,7 +99,7 @@ context = ...@@ -99,7 +99,7 @@ context =
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = {{ software_dir }}/scripts/cros_full_build.in template = {{ software_dir }}/scripts/cros_full_build.in
rendered = ${directory:run}/cros_full_build rendered = ${directory:run}/cros_full_build
md5sum = 78afe6cd7ba08a175b69af4b30d10921 md5sum = 2c5d17c0a907dc730cb24d09d1fb2d61
mode = 0700 mode = 0700
context = context =
key bash_path bin:bash key bash_path bin:bash
......
...@@ -275,16 +275,16 @@ sudodd() { sudo dd "\$@" ; } ...@@ -275,16 +275,16 @@ sudodd() { sudo dd "\$@" ; }
sudosafewrite() { __safewrite sudodd "\$@" ; } sudosafewrite() { __safewrite sudodd "\$@" ; }
crew() { crew() {
if [[ -x "$(command -v crew)" ]] ; then if [[ -x "\$(command -v crew)" ]] ; then
read -p "Chromebrew is not on this machine; do you want to install it? [Y/n] " -r -n 1 crew_install read -p "Chromebrew is not on this machine; do you want to install it? [Y/n] " -r -n 1 crew_install
echo "Fetching installation file..." echo "Fetching installation file..."
if [[ ! $crew_install =~ ^[Nn]$ ]] ; then if [[ ! \$crew_install =~ ^[Nn]$ ]] ; then
curl -Ls git.io/vddgY | bash curl -Ls git.io/vddgY | bash
else else
return 1 return 1
fi fi
else else
command crew "$@" command crew "\$@"
fi fi
} }
......
...@@ -26,7 +26,7 @@ recipe = slapos.recipe.template:jinja2 ...@@ -26,7 +26,7 @@ recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance.cfg template = ${:_profile_base_location_}/instance.cfg
rendered = ${buildout:directory}/instance.cfg rendered = ${buildout:directory}/instance.cfg
mode = 0644 mode = 0644
md5sum = 0b9663a126902bad34337d2245aa33a2 md5sum = 18425365676ffe7fe45e77a3f0838a0b
context = context =
key software_dir :_profile_base_location_ key software_dir :_profile_base_location_
key instance_dir buildout:directory key instance_dir buildout:directory
......
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