-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove last root requirements #130
Merged
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,49 +1,5 @@ | ||
#!/bin/sh -e | ||
|
||
if [ "$(id -un)" != "root" ]; then | ||
logger -p user.warn "$0: Must be run as 'root' instead of user '$(id -un)'." | ||
exit 77 # EX_NOPERM | ||
fi | ||
|
||
# Get name and uid of acap user and group | ||
_appname=dockerdwrapper | ||
_appdirectory=/usr/local/packages/$_appname | ||
_uname="$(stat -c '%U' "$_appdirectory")" | ||
_uid="$(id "$_uname" -u)" # user id | ||
_gid="$(id "$_uname" -g)" # user group id | ||
_gname="$(id "$_uname" -gn)" # user group name | ||
_all_gids="$(id "$_uname" -G)" # user sub-group ids | ||
|
||
# If the device supports cgroups v2 we need to start the user.service | ||
if [ ! -d /sys/fs/cgroup/unified ]; then | ||
# Update the app service file to Require [email protected] | ||
|
||
echo "[Unit] | ||
After=user@$_uid.service | ||
Requires=user@$_uid.service" >> /etc/systemd/system/sdkdockerdwrapper.service | ||
|
||
fi | ||
|
||
# Create mapping for subuid and subgid - both shall use user id as first value! | ||
echo "$_uid:100000:65536" >> /etc/subuid | ||
for sub_group_id in $_all_gids ; do | ||
if [ "$sub_group_id" -ne "$_gid" ]; then | ||
echo "$_uid:$sub_group_id:1" >> /etc/subgid | ||
fi | ||
done | ||
echo "$_uid:100000:65536" >> /etc/subgid | ||
|
||
# Update the app service file to work for our special case | ||
cat >> /etc/systemd/system/sdkdockerdwrapper.service << EOF | ||
[Unit] | ||
BindsTo=containerd.service | ||
After=network-online.target containerd.service var-spool-storage-SD_DISK.mount | ||
Wants=network-online.target | ||
EOF | ||
|
||
# Reload daemon for service file changes to take effect | ||
systemctl daemon-reload | ||
|
||
# *** non-root user should be able to do this **** | ||
|
||
# Move the daemon.json file into localdata folder | ||
|
This file was deleted.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line should be removed when schema is merged and we've updated to valid SDK