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
HongzheWang
slapos
Commits
03b9058b
Commit
03b9058b
authored
Jun 26, 2018
by
Lorenzo Martinico
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove re6stnet package
parent
a99fad0a
Changes
2
Show 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 @
03b9058b
...
@@ -116,4 +116,4 @@ context =
...
@@ -116,4 +116,4 @@ context =
# those packages will be marked as dependency of root filesystem
# those packages will be marked as dependency of root filesystem
raw nayu_dev_rootfs_packages app-misc/nayuos-chromium-policy
raw nayu_dev_rootfs_packages app-misc/nayuos-chromium-policy
# those packages will be marked as dependency of the chromium build itself
# 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 @
03b9058b
...
@@ -10,8 +10,6 @@ fi
...
@@ -10,8 +10,6 @@ fi
BOARD
=
$1
BOARD
=
$1
MOUNTPOINT
=
"/tmp/
${
BOARD
}
"
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"
INIT_SSH_SERVER
=
"etc/init/openssh-server.conf"
BASHRC
=
"etc/skel/.bashrc"
BASHRC
=
"etc/skel/.bashrc"
GIT_CORE
=
"usr/local/libexec/git-core/"
GIT_CORE
=
"usr/local/libexec/git-core/"
...
@@ -38,7 +36,6 @@ install -d "${MOUNTPOINT}"
...
@@ -38,7 +36,6 @@ install -d "${MOUNTPOINT}"
./mount_gpt_image.sh
--safe
-f
$(
./get_latest_image.sh
--board
=
${
BOARD
}
)
-r
${
MOUNTPOINT
}
./mount_gpt_image.sh
--safe
-f
$(
./get_latest_image.sh
--board
=
${
BOARD
}
)
-r
${
MOUNTPOINT
}
echo
$(
ls
"
${
MOUNTPOINT
}
/usr/local"
)
echo
$(
ls
"
${
MOUNTPOINT
}
/usr/local"
)
if
[[
$(
ls
"
${
MOUNTPOINT
}
/usr/local"
)
]]
;
then
if
[[
$(
ls
"
${
MOUNTPOINT
}
/usr/local"
)
]]
;
then
my_diff
=
$(
diff
"
${
ORIGINAL_GRANDENET_SCRIPT
}
"
"
${
MOUNTPOINT
}
/
${
GRANDENET_SCRIPT
}
"
)
opensshd_config
=
$(
ls
"
${
MOUNTPOINT
}
/
${
INIT_SSH_SERVER
}
"
)
opensshd_config
=
$(
ls
"
${
MOUNTPOINT
}
/
${
INIT_SSH_SERVER
}
"
)
gitcore
=
$(
ls
"
${
MOUNTPOINT
}
/
${
GIT_CORE
}
"
)
gitcore
=
$(
ls
"
${
MOUNTPOINT
}
/
${
GIT_CORE
}
"
)
gitexport
=
$(
grep
"
${
GIT_EXPECTED_EXPORT
}
"
"
${
MOUNTPOINT
}
/
${
BASHRC
}
"
)
gitexport
=
$(
grep
"
${
GIT_EXPECTED_EXPORT
}
"
"
${
MOUNTPOINT
}
/
${
BASHRC
}
"
)
...
@@ -60,15 +57,6 @@ if [[ "${is_empty}" == "1" ]] ; then
...
@@ -60,15 +57,6 @@ if [[ "${is_empty}" == "1" ]] ; then
else
else
print_result
${
SUCCESS
}
"/usr/local is not empty."
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"
echo
"* test openssh server init script absence"
if
[[
${
opensshd_config
}
]]
;
then
if
[[
${
opensshd_config
}
]]
;
then
print_result
${
FAILURE
}
"opensshd config exists:
${
opensshd_config
}
"
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