Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Eric Zheng
slapos
Commits
165df52b
Commit
165df52b
authored
Aug 10, 2018
by
Lorenzo Martinico
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Escape variables in bashrc
parent
b0c3f086
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
7 deletions
+18
-7
software/nayuos/instance.cfg
software/nayuos/instance.cfg
+1
-1
software/nayuos/scripts/cros_full_build.in
software/nayuos/scripts/cros_full_build.in
+16
-5
software/nayuos/software.cfg
software/nayuos/software.cfg
+1
-1
No files found.
software/nayuos/instance.cfg
View file @
165df52b
...
@@ -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 =
3b553e2f5800eb421f89723ede00c6ef
md5sum =
931c7e03f4460b76dfbb339242cd23f9
mode = 0700
mode = 0700
context =
context =
key bash_path bin:bash
key bash_path bin:bash
...
...
software/nayuos/scripts/cros_full_build.in
View file @
165df52b
...
@@ -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
}
}
...
@@ -356,8 +356,8 @@ mv {{ cros_location }}/{{ branch }}/chroot/tmp/*.img ${DIR_IMAGE_LOCATION}
...
@@ -356,8 +356,8 @@ mv {{ cros_location }}/{{ branch }}/chroot/tmp/*.img ${DIR_IMAGE_LOCATION}
cd ${DIR_IMAGE_LOCATION}
cd ${DIR_IMAGE_LOCATION}
for hashfunction in md5sum sha1sum sha256sum sha512sum; do
for hashfunction in md5sum sha1sum sha256sum sha512sum; do
echo ${hashfunction} >> hashes.txt
echo ${hashfunction} >>
unzipped_
hashes.txt
${hashfunction} *.img >> hashes.txt
${hashfunction} *.img >>
unzipped_
hashes.txt
printf "\n\n" >> hashes.txt
printf "\n\n" >> hashes.txt
done
done
...
@@ -365,4 +365,15 @@ for file in $(ls *.img); do
...
@@ -365,4 +365,15 @@ for file in $(ls *.img); do
gzip -9 -f ${file}
gzip -9 -f ${file}
done
done
for hashfunction in md5sum sha1sum sha256sum sha512sum; do
echo ${hashfunction} >> hashes.txt
${hashfunction} *.img.gz >> hashes.txt
printf "\n\n" >> hashes.txt
done
for file in $(ls *.img.gz); do
imageparent="public\/R[0-9]+\/(.*\/)*"
networkcache-upload --prefix-key packerimage- --url https://softinst62285.host.vifib.net/$BASH_REMATCH$(basename $file) --file $file --config {{ shacache_location }}/shacache.cfg && rm $file
done
exit 0
exit 0
software/nayuos/software.cfg
View file @
165df52b
...
@@ -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 =
7cbc3e35d5228680611aaa61ae1b5cd
e
md5sum =
11935a03f01796998e68f8d651eaf5e
e
context =
context =
key software_dir :_profile_base_location_
key software_dir :_profile_base_location_
key instance_dir buildout:directory
key instance_dir buildout:directory
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment