From 4fe5ac83287678a5f870def74ed28f45ab22815f Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Thu, 18 Mar 2021 23:15:01 -0600 Subject: database: do not chroot(".") unless actually necessary If we use default root (/), then we do not have to chroot to run scripts. Use APK_NO_CHROOT flag for this scenario to avoid the chroot. This helps with using apk with bwrap and OSTree. Closes #10736. --- src/context.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/context.c') diff --git a/src/context.c b/src/context.c index 784f082..a6d7e5d 100644 --- a/src/context.c +++ b/src/context.c @@ -42,6 +42,7 @@ int apk_ctx_prepare(struct apk_ctx *ac) if (!ac->keys_dir) ac->keys_dir = "etc/apk/keys"; if (!ac->root) ac->root = "/"; if (!ac->cache_max_age) ac->cache_max_age = 4*60*60; /* 4 hours default */ + if (!strcmp(ac->root, "/")) ac->flags |= APK_NO_CHROOT; /* skip chroot if root is default */ ac->root_fd = openat(AT_FDCWD, ac->root, O_RDONLY | O_CLOEXEC); if (ac->root_fd < 0 && (ac->open_flags & APK_OPENF_CREATE)) { -- cgit v1.2.3-70-g09d2