Skip to content
This repository was archived by the owner on Oct 10, 2020. It is now read-only.

Commit 983a864

Browse files
giusepperh-atomic-bot
authored andcommitted
syscontainers: allow runtime defined in the configuration file
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> Closes: #1125 Approved by: TomSweeneyRedHat
1 parent 09c1489 commit 983a864

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

Atomic/syscontainers.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,10 @@ def set_args(self, args):
154154
except (NameError, AttributeError):
155155
pass
156156

157+
if not self.user and not self.runtime:
158+
self.runtime = self.get_atomic_config_item(["runtime"])
159+
160+
157161
@staticmethod
158162
def _split_set_args(setvalues):
159163
values = {}

docs/atomic-install.1.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,11 @@ will only contain config and info files.
7272

7373
**--runtime=PATH**
7474
Change the OCI runtime used by the systemd service file for running
75-
system containers and user containers. The default **/bin/runc** is
76-
used for system containers. Conversely, for user containers the
77-
default value is **/bin/bwrap-oci**.
75+
system containers and user containers. If runtime is not defined, the
76+
value **runtime** in the configuration file is used for system
77+
containers. If there is no runtime defined in the configuration file
78+
as well, then the default **/bin/runc** is used for system containers.
79+
Conversely, for user containers the default value is **/bin/bwrap-oci**.
7880

7981
**--set=NAME=VALUE**
8082
Set a value that is going to be used by a system container for its

0 commit comments

Comments
 (0)