Use errors=remount-ro mount option with ext3 filesystems only

apptainer · Nov 27, 2019 · 3f3136b · 3f3136b
1 parent e33f028
commit 3f3136b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/internal/pkg/runtime/engine/imgbuild/create_linux.go b/internal/pkg/runtime/engine/imgbuild/create_linux.go
@@ -96,7 +96,7 @@ func (e *EngineOperations) CreateContainer(ctx context.Context, pid int, rpcConn
 	}
 
 	sylog.Debugf("Mounting image directory %s\n", rootfs)
-	if err := rpcOps.Mount(rootfs, sessionRootFs, "", syscall.MS_BIND, "errors=remount-ro"); err != nil {
+	if err := rpcOps.Mount(rootfs, sessionRootFs, "", syscall.MS_BIND, ""); err != nil {
 		return fmt.Errorf("failed to mount directory filesystem %s: %s", rootfs, err)
 	}
 

diff --git a/internal/pkg/util/fs/mount/mount_linux.go b/internal/pkg/util/fs/mount/mount_linux.go
@@ -610,7 +610,10 @@ func (p *Points) AddImage(tag AuthorizedTag, source string, dest string, fstype
 		return fmt.Errorf("invalid image size, zero length")
 	}
 	keyB64 := base64.StdEncoding.EncodeToString(key)
-	options = fmt.Sprintf("loop,offset=%d,sizelimit=%d,key=%s,errors=remount-ro", offset, sizelimit, keyB64)
+	options = fmt.Sprintf("loop,offset=%d,sizelimit=%d,key=%s", offset, sizelimit, keyB64)
+	if fstype == "ext3" {
+		options += ",errors=remount-ro"
+	}
 	return p.add(tag, source, dest, fstype, flags, options)
 }
 

diff --git a/pkg/ocibundle/sif/bundle_linux.go b/pkg/ocibundle/sif/bundle_linux.go
@@ -125,7 +125,7 @@ func (s *sifBundle) Create(ociConfig *specs.Spec) error {
 	}
 
 	rootFs := tools.RootFs(s.bundlePath).Path()
-	if err := syscall.Mount(loop, rootFs, "squashfs", syscall.MS_RDONLY, "errors=remount-ro"); err != nil {
+	if err := syscall.Mount(loop, rootFs, "squashfs", syscall.MS_RDONLY, ""); err != nil {
 		tools.DeleteBundle(s.bundlePath)
 		return fmt.Errorf("failed to mount SIF partition: %s", err)
 	}