libpod/container: Replace containerState* with containerPlatformState

This way we don't need to stub in structures for other OSes (e.g. the
Darwin stub in a Linux-only file).  Matthew was concerned about errors
unmarshalling, say, a Linux state object on a Windows box [1], but we
can address that in checks when loading the database [2].

[1]: https://github.com/projectatomic/libpod/pull/1015#discussion_r198649043
[2]: https://github.com/projectatomic/libpod/pull/1015#discussion_r198802956

Signed-off-by: W. Trevor King <wking@tremily.us>

Closes: #1033
Approved by: mheon

1 files changed, 12 insertions, 6 deletions

diff --git a/libpod/boltdb_state_internal.go b/libpod/boltdb_state_internal.go
index 44f764be1..e8aa6860b 100644
--- a/libpod/boltdb_state_internal.go
+++ b/libpod/boltdb_state_internal.go
@@ -3,6 +3,7 @@ package libpod
 import (
 	"encoding/json"
 	"path/filepath"
+	"runtime"
 	"strings"
 
 	"github.com/boltdb/bolt"
@@ -48,13 +49,14 @@ var (
 // Check if the configuration of the database is compatible with the
 // configuration of the runtime opening it
 // If there is no runtime configuration loaded, load our own
-func checkRuntimeConfig(db *bolt.DB, runtime *Runtime) error {
+func checkRuntimeConfig(db *bolt.DB, rt *Runtime) error {
 	var (
 		staticDir       = []byte("static-dir")
 		tmpDir          = []byte("tmp-dir")
 		runRoot         = []byte("run-root")
 		graphRoot       = []byte("graph-root")
 		graphDriverName = []byte("graph-driver-name")
+		osKey           = []byte("os")
 	)
 
 	err := db.Update(func(tx *bolt.Tx) error {
@@ -63,30 +65,34 @@ func checkRuntimeConfig(db *bolt.DB, runtime *Runtime) error {
 			return err
 		}
 
+		if err := validateDBAgainstConfig(configBkt, "OS", runtime.GOOS, osKey, runtime.GOOS); err != nil {
+			return err
+		}
+
 		if err := validateDBAgainstConfig(configBkt, "static dir",
-			runtime.config.StaticDir, staticDir, ""); err != nil {
+			rt.config.StaticDir, staticDir, ""); err != nil {
 			return err
 		}
 
 		if err := validateDBAgainstConfig(configBkt, "tmp dir",
-			runtime.config.TmpDir, tmpDir, ""); err != nil {
+			rt.config.TmpDir, tmpDir, ""); err != nil {
 			return err
 		}
 
 		if err := validateDBAgainstConfig(configBkt, "run root",
-			runtime.config.StorageConfig.RunRoot, runRoot,
+			rt.config.StorageConfig.RunRoot, runRoot,
 			storage.DefaultStoreOptions.RunRoot); err != nil {
 			return err
 		}
 
 		if err := validateDBAgainstConfig(configBkt, "graph root",
-			runtime.config.StorageConfig.GraphRoot, graphRoot,
+			rt.config.StorageConfig.GraphRoot, graphRoot,
 			storage.DefaultStoreOptions.GraphRoot); err != nil {
 			return err
 		}
 
 		return validateDBAgainstConfig(configBkt, "graph driver name",
-			runtime.config.StorageConfig.GraphDriverName,
+			rt.config.StorageConfig.GraphDriverName,
 			graphDriverName,
 			storage.DefaultStoreOptions.GraphDriverName)
 	})