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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kwabena Antwi-Boasiako
slapos
Commits
7c98786e
Commit
7c98786e
authored
Jun 26, 2018
by
Lorenzo Martinico
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove re6stnet package
parent
880dcfdf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
13 deletions
+1
-13
software/nayuos/instance.cfg
software/nayuos/instance.cfg
+1
-1
software/nayuos/scripts/test_nayuos_image
software/nayuos/scripts/test_nayuos_image
+0
-12
No files found.
software/nayuos/instance.cfg
View file @
7c98786e
...
...
@@ -116,4 +116,4 @@ context =
# those packages will be marked as dependency of root filesystem
raw nayu_dev_rootfs_packages app-misc/nayuos-chromium-policy
# those packages will be marked as dependency of the chromium build itself
raw nayu_dev_packages
net-misc/re6stnet
dev-vcs/git dev-python/flask dev-python/virtualenv sys-fs/cryptsetup
raw nayu_dev_packages dev-vcs/git dev-python/flask dev-python/virtualenv sys-fs/cryptsetup
software/nayuos/scripts/test_nayuos_image
View file @
7c98786e
...
...
@@ -10,8 +10,6 @@ fi
BOARD
=
$1
MOUNTPOINT
=
"/tmp/
${
BOARD
}
"
ORIGINAL_GRANDENET_SCRIPT
=
~/trunk/src/third_party/chromiumos-overlay/net-misc/re6stnet/files/grandenet
GRANDENET_SCRIPT
=
"usr/local/bin/grandenet"
INIT_SSH_SERVER
=
"etc/init/openssh-server.conf"
BASHRC
=
"etc/skel/.bashrc"
GIT_CORE
=
"usr/local/libexec/git-core/"
...
...
@@ -38,7 +36,6 @@ install -d "${MOUNTPOINT}"
./mount_gpt_image.sh
--safe
-f
$(
./get_latest_image.sh
--board
=
${
BOARD
}
)
-r
${
MOUNTPOINT
}
echo
$(
ls
"
${
MOUNTPOINT
}
/usr/local"
)
if
[[
$(
ls
"
${
MOUNTPOINT
}
/usr/local"
)
]]
;
then
my_diff
=
$(
diff
"
${
ORIGINAL_GRANDENET_SCRIPT
}
"
"
${
MOUNTPOINT
}
/
${
GRANDENET_SCRIPT
}
"
)
opensshd_config
=
$(
ls
"
${
MOUNTPOINT
}
/
${
INIT_SSH_SERVER
}
"
)
gitcore
=
$(
ls
"
${
MOUNTPOINT
}
/
${
GIT_CORE
}
"
)
gitexport
=
$(
grep
"
${
GIT_EXPECTED_EXPORT
}
"
"
${
MOUNTPOINT
}
/
${
BASHRC
}
"
)
...
...
@@ -60,15 +57,6 @@ if [[ "${is_empty}" == "1" ]] ; then
else
print_result
${
SUCCESS
}
"/usr/local is not empty."
echo
"* test grandenet script existence and content"
if
[[
${
no_grandenet_script
}
==
1
]]
;
then
print_result
${
FAILURE
}
"grandenet script is missing (no file at
${
GRANDENET_SCRIPT
}
)."
elif
[[
${
my_diff
}
!=
""
]]
;
then
print_result
${
FAILURE
}
"grandenet scripts differs:
\n
${
my_diff
}
"
else
print_result
${
SUCCESS
}
"
${
GRANDENET_SCRIPT
}
exists and contains what is expected."
fi
echo
"* test openssh server init script absence"
if
[[
${
opensshd_config
}
]]
;
then
print_result
${
FAILURE
}
"opensshd config exists:
${
opensshd_config
}
"
...
...
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