Merge pull request #3051 from mheon/podman_migrate_fixes

Small fixes for #2950

1 files changed, 3 insertions, 18 deletions

diff --git a/libpod/options.go b/libpod/options.go
index 9932d5453..d3e0a295d 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -1,7 +1,6 @@
 package libpod
 
 import (
-	"context"
 	"net"
 	"os"
 	"path/filepath"
@@ -437,10 +436,9 @@ func WithRenumber() RuntimeOption {
 	}
 }
 
-// WithMigrate instructs libpod to perform a lock migrateing while
-// initializing. This will handle migrations from early versions of libpod with
-// file locks to newer versions with SHM locking, as well as changes in the
-// number of configured locks.
+// WithMigrate instructs libpod to migrate container configurations to account
+// for changes between Libpod versions. All running containers will be stopped
+// during a migration, then restarted after the migration is complete.
 func WithMigrate() RuntimeOption {
 	return func(rt *Runtime) error {
 		if rt.valid {
@@ -467,19 +465,6 @@ func WithShmDir(dir string) CtrCreateOption {
 	}
 }
 
-// WithContext sets the context to use.
-func WithContext(ctx context.Context) RuntimeOption {
-	return func(rt *Runtime) error {
-		if rt.valid {
-			return ErrRuntimeFinalized
-		}
-
-		rt.ctx = ctx
-
-		return nil
-	}
-}
-
 // WithSystemd turns on systemd mode in the container
 func WithSystemd() CtrCreateOption {
 	return func(ctr *Container) error {