Skip to content
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

Issue109 #110

Merged
merged 4 commits into from
Dec 22, 2015
Merged

Issue109 #110

merged 4 commits into from
Dec 22, 2015

Conversation

konstruktoid
Copy link
Collaborator

Thanks to @gmanfunky, a couple of issues was found and better handling of systems where systemctl doesn't work was implemented.

Fixes #109

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
@@ -20,7 +20,7 @@ fi

# 3.2
check_3_2="3.2 - Verify that docker.service file permissions are set to 644"
file="$(get_systemd_service_file docker-registry.service)"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch.

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
@konstruktoid
Copy link
Collaborator Author

Test /etc/systemd/system/${SERVICE}, first then use systemctl, and if that fails fall back to /usr/lib/systemd/system/$SERVICE.

I prefer to include systemctl show because things might not wind up where one would expect.

$ systemctl show -p FragmentPath docker.socket
FragmentPath=/lib/systemd/system/docker.socket

konstruktoid added a commit that referenced this pull request Dec 22, 2015
@konstruktoid konstruktoid merged commit 81fc9ac into docker:master Dec 22, 2015
@konstruktoid konstruktoid deleted the issue109 branch December 22, 2015 18:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants