New upstream version 1.0.0+git20190326.5bd4aa9

1 files changed, 7 insertions, 3 deletions

diff --git a/action.go b/action.go
index 85a4d12..deaa6df 100644
--- a/action.go
+++ b/action.go
@@ -21,7 +21,7 @@ type Partition struct {
 	DevicePath string
 }
 
-type DebosContext struct {
+type CommonContext struct {
 	Scratchdir      string
 	Rootdir         string
 	Artifactdir     string
@@ -31,8 +31,6 @@ type DebosContext struct {
 	ImageMntDir     string
 	ImageFSTab      bytes.Buffer // Fstab as per partitioning
 	ImageKernelRoot string       // Kernel cmdline root= snippet for the / of the image
-	RecipeDir       string
-	Architecture    string
 	DebugShell      string
 	Origins         map[string]string
 	State           DebosState
@@ -41,6 +39,12 @@ type DebosContext struct {
 	Verbose         bool
 }
 
+type DebosContext struct {
+	*CommonContext
+	RecipeDir       string
+	Architecture    string
+}
+
 type Action interface {
 	/* FIXME verify should probably be prepare or somesuch */
 	Verify(context *DebosContext) error