Skip to content

Commit 8f894f8

Browse files
authored
Merge pull request #2794 from roman-kiselenko/cleanup/rootless-setuptool
`containerd-rootless-setuptool.sh uninstall` cleanup all relevant services
2 parents 8e9f510 + 6a22953 commit 8f894f8

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

extras/rootless/containerd-rootless-setuptool.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,8 +512,14 @@ cmd_entrypoint_install_ipfs() {
512512
cmd_entrypoint_uninstall() {
513513
init
514514
uninstall_systemd_unit "${SYSTEMD_BUILDKIT_UNIT}"
515+
if [ -n "${CONTAINERD_NAMESPACE:-}" ]; then
516+
uninstall_systemd_unit "${CONTAINERD_NAMESPACE}-${SYSTEMD_BUILDKIT_UNIT}"
517+
fi
515518
uninstall_systemd_unit "${SYSTEMD_FUSE_OVERLAYFS_UNIT}"
516519
uninstall_systemd_unit "${SYSTEMD_CONTAINERD_UNIT}"
520+
uninstall_systemd_unit "${SYSTEMD_STARGZ_UNIT}"
521+
uninstall_systemd_unit "${SYSTEMD_IPFS_UNIT}"
522+
uninstall_systemd_unit "${SYSTEMD_BYPASS4NETNSD_UNIT}"
517523

518524
INFO "This uninstallation tool does NOT remove containerd binaries and data."
519525
INFO "To remove data, run: \`$BIN/rootlesskit rm -rf ${XDG_DATA_HOME}/containerd\`"

0 commit comments

Comments
 (0)