Merge pull request #14100 from mheon/incremental_backports

[v4.1] Incremental backports

2 files changed, 10 insertions, 1 deletions

diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index b56c36015..89b09bb1d 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -641,7 +641,11 @@ func (ic *ContainerEngine) ContainerRestore(ctx context.Context, namesOrIds []st
 				}
 				restoreOptions.CheckpointImageID = img.ID()
 				mountPoint, err := img.Mount(ctx, nil, "")
-				defer img.Unmount(true)
+				defer func() {
+					if err := img.Unmount(true); err != nil {
+						logrus.Errorf("Failed to unmount image: %v", err)
+					}
+				}()
 				if err != nil {
 					return nil, err
 				}
diff --git a/pkg/domain/infra/abi/parse/parse.go b/pkg/domain/infra/abi/parse/parse.go
index 2d1adab74..3bac2ef99 100644
--- a/pkg/domain/infra/abi/parse/parse.go
+++ b/pkg/domain/infra/abi/parse/parse.go
@@ -73,6 +73,11 @@ func VolumeOptions(opts map[string]string) ([]libpod.VolumeCreateOption, error)
 					finalVal = append(finalVal, o)
 					// set option "GID": "$gid"
 					volumeOptions["GID"] = splitO[1]
+				case "noquota":
+					logrus.Debugf("Removing noquota from options and adding WithVolumeDisableQuota")
+					libpodOptions = append(libpodOptions, libpod.WithVolumeDisableQuota())
+					// set option "NOQUOTA": "true"
+					volumeOptions["NOQUOTA"] = "true"
 				default:
 					finalVal = append(finalVal, o)
 				}