From c6fe4430b76ceeecd6b0b609cca8e705921db0c4 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Tue, 7 Nov 2017 13:46:30 -0500 Subject: Compile-tested implementation of SQL-backed state Signed-off-by: Matthew Heon --- libpod/options.go | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'libpod/options.go') diff --git a/libpod/options.go b/libpod/options.go index 10cb605c2..fb64c0c41 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -236,25 +236,6 @@ func WithNoPivotRoot(noPivot bool) RuntimeOption { // Container Creation Options -// WithRootFSFromPath uses the given path as a container's root filesystem -// No further setup is performed on this path -func WithRootFSFromPath(path string) CtrCreateOption { - return func(ctr *Container) error { - if ctr.valid { - return ErrCtrFinalized - } - - if ctr.config.RootfsDir != "" || ctr.config.RootfsImageID != "" || ctr.config.RootfsImageName != "" { - return errors.Wrapf(ErrInvalidArg, "container already configured with root filesystem") - } - - ctr.config.RootfsDir = path - ctr.config.RootfsFromImage = false - - return nil - } -} - // WithSELinuxMountLabel sets the mount label for SELinux func WithSELinuxMountLabel(mountLabel string) CtrCreateOption { return func(ctr *Container) error { @@ -277,14 +258,13 @@ func WithRootFSFromImage(imageID string, imageName string, useImageConfig bool) return ErrCtrFinalized } - if ctr.config.RootfsDir != "" || ctr.config.RootfsImageID != "" || ctr.config.RootfsImageName != "" { + if ctr.config.RootfsImageID != "" || ctr.config.RootfsImageName != "" { return errors.Wrapf(ErrInvalidArg, "container already configured with root filesystem") } ctr.config.RootfsImageID = imageID ctr.config.RootfsImageName = imageName ctr.config.UseImageConfig = useImageConfig - ctr.config.RootfsFromImage = true return nil } -- cgit v1.2.3-54-g00ecf