temp. fix after rebase: move createVTPMs to later point

Since config.Namespaces is not filled at this point (due to a bug
in runc), we need to move the createVTPMs to a later point.

Signed-off-by: Stefan Berger <[email protected]>

Author: stefanberger

libcontainer/specconv/spec_linux.go

@@ -201,9 +201,6 @@ func CreateLibcontainerConfig(opts *CreateOpts) (*configs.Config, error) {
 	if err := setupUserNamespace(spec, config); err != nil {
 		return nil, err
 	}
-	if err := createVTPMs(spec, config); err != nil {
-		return nil, err
-	}
 	c, err := createCgroupConfig(opts)
 	if err != nil {
 		return nil, err
@@ -237,6 +234,9 @@ func CreateLibcontainerConfig(opts *CreateOpts) (*configs.Config, error) {
 			config.Seccomp = seccomp
 		}
 	}
+	if err := createVTPMs(spec, config); err != nil {
+		return nil, err
+	}
 	if spec.Process.SelinuxLabel != "" {
 		config.ProcessLabel = spec.Process.SelinuxLabel
 	}
@@ -524,11 +524,11 @@ func createVTPMs(spec *specs.Spec, config *configs.Config) error {
 		return nil
 	}
 
-	rootUID, err := config.HostUID(0)
+	rootUID, err := config.HostRootUID()
 	if err != nil {
 		return err
 	}
-	rootGID, err := config.HostGID(0)
+	rootGID, err := config.HostRootGID()
 	if err != nil {
 		return err
 	}