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
Valentin Benozillo
slapos
Commits
da67363d
Commit
da67363d
authored
Jun 26, 2018
by
Lorenzo Martinico
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove python packages flask, virtualenv
parent
362213c2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
16 deletions
+1
-16
software/nayuos/instance.cfg
software/nayuos/instance.cfg
+1
-1
software/nayuos/scripts/test_nayuos_image
software/nayuos/scripts/test_nayuos_image
+0
-15
No files found.
software/nayuos/instance.cfg
View file @
da67363d
...
@@ -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
dev-python/flask dev-python/virtualenv
sys-fs/cryptsetup
raw nayu_dev_packages sys-fs/cryptsetup
software/nayuos/scripts/test_nayuos_image
View file @
da67363d
...
@@ -12,7 +12,6 @@ BOARD=$1
...
@@ -12,7 +12,6 @@ BOARD=$1
MOUNTPOINT
=
"/tmp/
${
BOARD
}
"
MOUNTPOINT
=
"/tmp/
${
BOARD
}
"
INIT_SSH_SERVER
=
"etc/init/openssh-server.conf"
INIT_SSH_SERVER
=
"etc/init/openssh-server.conf"
BASHRC
=
"etc/skel/.bashrc"
BASHRC
=
"etc/skel/.bashrc"
VIRTUALENV_BIN
=
"usr/local/bin/virtualenv"
CHROMIUM_POLICY
=
"etc/chromium/policies/recommended/nayuos_policy.json"
CHROMIUM_POLICY
=
"etc/chromium/policies/recommended/nayuos_policy.json"
HAS_FAILED
=
0
HAS_FAILED
=
0
...
@@ -35,9 +34,7 @@ install -d "${MOUNTPOINT}"
...
@@ -35,9 +34,7 @@ install -d "${MOUNTPOINT}"
echo
$(
ls
"
${
MOUNTPOINT
}
/usr/local"
)
echo
$(
ls
"
${
MOUNTPOINT
}
/usr/local"
)
if
[[
$(
ls
"
${
MOUNTPOINT
}
/usr/local"
)
]]
;
then
if
[[
$(
ls
"
${
MOUNTPOINT
}
/usr/local"
)
]]
;
then
opensshd_config
=
$(
ls
"
${
MOUNTPOINT
}
/
${
INIT_SSH_SERVER
}
"
)
opensshd_config
=
$(
ls
"
${
MOUNTPOINT
}
/
${
INIT_SSH_SERVER
}
"
)
virtualenvbin
=
$(
ls
"
${
MOUNTPOINT
}
/
${
VIRTUALENV_BIN
}
"
)
chromium_policy
=
$(
ls
"
${
MOUNTPOINT
}
/
${
CHROMIUM_POLICY
}
"
)
chromium_policy
=
$(
ls
"
${
MOUNTPOINT
}
/
${
CHROMIUM_POLICY
}
"
)
else
else
is_empty
=
1
is_empty
=
1
fi
fi
...
@@ -60,18 +57,6 @@ else
...
@@ -60,18 +57,6 @@ else
print_result
${
SUCCESS
}
"opensshd config removed."
print_result
${
SUCCESS
}
"opensshd config removed."
fi
fi
echo
"* test if git core directory is not empty"
echo
"* test bashrc changes for git paths quick fix"
echo
"* test if virtualenv binary exists"
if
[[
${
virtualenvbin
}
]]
;
then
print_result
${
SUCCESS
}
"virtualenv binary exists."
else
print_result
${
FAILURE
}
"Expected virtualenv binary not in
${
MOUNTPOINT
}
/
${
VIRTUALENV_BIN
}
."
fi
echo
"* test if Chromium policies are installed"
echo
"* test if Chromium policies are installed"
if
[[
${
chromium_policy
}
]]
;
then
if
[[
${
chromium_policy
}
]]
;
then
...
...
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