[lxc-devel] [lxd-pkg-snap/latest-edge] include lxcfs pidfd into lxd snap configuration

[monkz on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 383 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200409/5cd5973f/attachment.bin>
-------------- next part --------------
From f0d4090cc069a06af49d6d53e0e45f6d187a9fae Mon Sep 17 00:00:00 2001
From: Malte Kuhn <mkuhn at maxcluster.de>
Date: Thu, 9 Apr 2020 10:21:19 +0200
Subject: [PATCH] include lxcfs pidfd into lxd snap configuration

---
 snapcraft.yaml                  | 1 +
 snapcraft/commands/daemon.start | 1 +
 snapcraft/hooks/configure       | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index b3e3401..30d02f2 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -21,6 +21,7 @@ description: |-
    - daemon.debug: Increases logging to debug level [default=false]
    - daemon.group: Group of users that can interact with LXD [default=lxd]
    - daemon.preseed: A YAML configuration to feed `lxd init` on initial start
+   - lxcfs.pidfd: Start tracking per-container process tracking [default=false]
    - lxcfs.loadavg: Start tracking per-container load average [default=false]
    - lxcfs.cfs: Consider CPU shares for CPU usage [default=false]
    - openvswitch.builtin: Run a snap-specific OVS daemon [default=false]
diff --git a/snapcraft/commands/daemon.start b/snapcraft/commands/daemon.start
index 8a162c5..0de810e 100755
--- a/snapcraft/commands/daemon.start
+++ b/snapcraft/commands/daemon.start
@@ -372,6 +372,7 @@ else
         export LD_LIBRARY_PATH="${SNAP_CURRENT}/lib:${SNAP_CURRENT}/lib/${ARCH}"
         lxcfs_args=
         [ "${lxcfs_loadavg:-"false"}" = "true" ] && lxcfs_args="${lxcfs_args} --enable-loadavg"
+        [ "${lxcfs_pidfd:-"false"}" = "true" ] && lxcfs_args="${lxcfs_args} --enable-pidfd"
         [ "${lxcfs_cfs:-"false"}" = "true" ] && lxcfs_args="${lxcfs_args} --enable-cfs"
 
         if [ -n "${lxcfs_args}" ]; then
diff --git a/snapcraft/hooks/configure b/snapcraft/hooks/configure
index 6f00d48..63860fc 100755
--- a/snapcraft/hooks/configure
+++ b/snapcraft/hooks/configure
@@ -48,6 +48,7 @@ criu_enable=$(get_bool "$(snapctl get criu.enable)")
 daemon_debug=$(get_bool "$(snapctl get daemon.debug)")
 daemon_group=$(snapctl get daemon.group)
 lxcfs_loadavg=$(get_bool "$(snapctl get lxcfs.loadavg)")
+lxcfs_pidfd=$(get_bool "$(snapctl get lxcfs.pidfd)")
 lxcfs_cfs=$(get_bool "$(snapctl get lxcfs.cfs)")
 openvswitch_builtin=$(get_bool "$(snapctl get openvswitch.builtin)")
 shiftfs_enable=$(get_bool "$(snapctl get shiftfs.enable)")
@@ -68,6 +69,7 @@ config="${SNAP_COMMON}/config"
     echo "daemon_debug=${daemon_debug:-"false"}"
     echo "daemon_group=${daemon_group:-"lxd"}"
     echo "lxcfs_loadavg=${lxcfs_loadavg:-"false"}"
+    echo "lxcfs_pidfd=${lxcfs_pidfd:-"false"}"
     echo "lxcfs_cfs=${lxcfs_cfs:-"false"}"
     echo "openvswitch_builtin=${openvswitch_builtin:-"false"}"
     echo "shiftfs_enable=${shiftfs_enable:-"auto"}"