From 1029bfd50fb7efd93eddd86d0027bf08655d0b4e Mon Sep 17 00:00:00 2001 From: fengxsong Date: Fri, 2 Jun 2023 19:12:54 +0800 Subject: [PATCH] fix: add default configs in storage.options.overlay section (#3236) Signed-off-by: fengxsong --- pkg/buildah/setup.go | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkg/buildah/setup.go b/pkg/buildah/setup.go index f622ffc68..a62e4412c 100644 --- a/pkg/buildah/setup.go +++ b/pkg/buildah/setup.go @@ -98,15 +98,16 @@ location = "docker.io/labring" const ( defaultRootStorageConf = `[storage] - driver = "overlay" - runroot = "/run/containers/storage" - graphroot = "/var/lib/containers/storage"` +driver = "overlay" +runroot = "/run/containers/storage" +graphroot = "/var/lib/containers/storage"` defaultRootlessStorageConf = `[storage] - driver = "overlay" - runroot = "/run/user/%d"` - mountProgramSnippet = ` - [storage.options] - mount_program = "/bin/fuse-overlayfs"` +driver = "overlay" +runroot = "/run/user/%d"` + storageOptionsOverlaySnippet = ` +[storage.options.overlay] +mount_program = "/bin/fuse-overlayfs" +mountopt = "nodev,fsync=0"` ) // todo: what if running by containerd? @@ -133,7 +134,7 @@ func setupStorageConfigFile() error { content = defaultRootStorageConf } if unshare.IsRootless() || isRunningInContainer() { - content += mountProgramSnippet + content += storageOptionsOverlaySnippet } return writeFileIfNotExists(DefaultConfigFile, []byte(content)) }