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

Debug: Provide a way to enable a debug console to the VM #122

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Debug: Provide a way to enable a debug console to the VM #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ HAVE_SYSTEMD := $(shell pkg-config --exists systemd 2>/dev/null && echo 'yes')

ifeq ($(HAVE_SYSTEMD),yes)
UNIT_DIR := $(shell pkg-config --variable=systemdsystemunitdir systemd)
UNIT_FILES = clear-containers.service
UNIT_FILES = clear-containers.service clear-containers-debug.service
GENERATED_FILES := $(UNIT_FILES)
UNIT_FILES += clear-containers.target
UNIT_FILES += clear-containers.target clear-containers-debug.target
endif

SED = sed
Expand Down
10 changes: 10 additions & 0 deletions clear-containers-debug.service.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[Unit]
Description=Clear Container debug console

[Service]
Environment=PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
StandardInput=tty
StandardOutput=tty
PrivateDevices=yes
Type=simple
ExecStart=/usr/bin/bash
Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder if this should be /bin/sh for portability?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jodh-intel yes. I would prefer the most minimal shell that clear linux provides as a package.

@jcvenegas what are our options? I would rather not have a separate debug image just for this. Or if we end up with a separate image, we should always package and distribute it with the non debug image, so that the user has the confidence that they are using the exact same version of all the image components and be able to flip to the debug image by just modifying the toml config file.

Copy link
Contributor

Choose a reason for hiding this comment

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

@mcastelino @jodh-intel today there is not busybox in CL, will need to request a new shell .

8 changes: 8 additions & 0 deletions clear-containers-debug.target
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[Unit]
Description=Clear Containers Agent Target
Requires=basic.target
Requires=clear-containers.service
Wants=clear-containers-debug-console.service
Conflicts=rescue.service rescue.target
After=basic.target rescue.service rescue.target
AllowIsolate=yes