Revert "snapcraft: apply temporary workaround for core24 to fix snap …

…reload" This reverts commit 5db3438. We don't need it starting from snapd 2.64 as it includes: canonical/snapd#14118 Signed-off-by: Alexander Mikhalitsyn <[email protected]>
mihalicyn · Jul 3, 2024 · c2e2122 · c2e2122
1 parent 1a5b780
commit c2e2122
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/snapcraft/commands/daemon.start b/snapcraft/commands/daemon.start
@@ -39,13 +39,6 @@ fi
 # Detect base name
 SNAP_BASE="$(sed -n '/^name:/ s/^name:\s*\(core[0-9]\{2\}\)/\1/p' /meta/snap.yaml)"
 
-# Temporary hack to workaround systemctl reload snap.lxd.daemon
-# problem with core24-based LXD snap
-if [ "${SNAP_BASE}" = "core24" ]; then
-    _LXD_SNAP_DEVCGROUP_CONFIG="/var/lib/snapd/hostfs/var/lib/snapd/cgroup/snap.lxd.device"
-    grep -qxF 'self-managed=true' "${_LXD_SNAP_DEVCGROUP_CONFIG}" || echo 'self-managed=true' >> "${_LXD_SNAP_DEVCGROUP_CONFIG}"
-fi
-
 # Wait for appliance configuration
 if [ "${LXD_APPLIANCE}" = "true" ]; then
     while :; do