Skip to content
This repository has been archived by the owner on Feb 24, 2020. It is now read-only.

rkt: misc systemd-related fixes #3418

Merged
merged 3 commits into from
Nov 28, 2016
Merged

rkt: misc systemd-related fixes #3418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d46ff4
stage1/common: gate systemd protection properties to >=233
lucab Nov 28, 2016
d9cb220
makelib: add a git describe step
lucab Nov 28, 2016
f51d2fc
tests: rkt-inspect does not notify systemd yet
lucab Nov 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions makelib/git.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ $(_GCL_FULL_PATH_): | $(GCL_DIRECTORY)
$(_GCL_GIT_) reset --hard $(call vl3,--quiet) "$${rev}"; \
$(call vb,vt,GIT CLEAN,$(call vsp,$(GCL_DIRECTORY))) \
$(_GCL_GIT_) clean -ffdx $(call vl3,--quiet); \
human_rev="$$($(_GCL_GIT_) describe --always)"; \
$(call vb,vt,GIT DESCRIBE,$(GCL_REPOSITORY) ($(GCL_COMMITTISH)) => "$${human_rev}") \
touch "$@"

# remove the GCL_DIRECTORY if GCL_REPOSITORY changes
Expand Down
2 changes: 1 addition & 1 deletion stage1/init/common/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,7 @@ func protectKernelTunables(opts []*unit.UnitOption, appName types.ACName, system
opts = append(opts, unit.NewUnitOption("Service", "InaccessiblePaths", fmt.Sprintf("-%s", filepath.Join(common.RelAppRootfsPath(appName), p))))
}
}
if systemdVersion >= 232 {
if systemdVersion >= 233 {
opts = append(opts, unit.NewUnitOption("Service", "ProtectKernelTunables", "true"))
}

Expand Down
2 changes: 1 addition & 1 deletion tests/image/manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
},
{
"name": "appc.io/executor/supports-systemd-notify",
"value": "true"
"value": "false"
}
]
}