proto: Drop LinuxSpec (and work around 'linux' sensitivity)

wking · wking · commit 9371318e5419 · 2015-09-27T00:31:34.000-07:00
With LinuxSpec, a parser will have to know ahead of time what sort of
config it's reading, any you'll end up with config JSON like:

  {
    "spec": { ...platform agnostic stuff ... },
    "linux_config": { ...Linux-specific stuff... }
  }

By dropping it and adding a LinuxConfig entry to Spec itself, we get
back to our Markdown-specified:

  {
    ...platform agnostic stuff... ,
    "linux": { ...Linux-specific stuff... }
  }

As a minor (I hope) wrinkle, I've changed the field name from "linux"
to "linuxx" to avoid:

  $ make
  protoc --cpp_out=./cpp/ config.proto
  pkg-config --cflags protobuf  # fails if protobuf is not installed
  -pthread
  c++ example.cc ./cpp/config.pb.cc -o example_cpp $(pkg-config --cflags --libs protobuf) -I ./cpp
  ./cpp/config.pb.h:159:25: error: expected unqualified-id before numeric constant
     const ::oci::Process&amp; linux() const;
                           ^
  ...

that seems tied to attributes named "linux".  Hopefully someone will
figure out how to avoid that, in which case we can drop the silly
"linuxx" name.

Signed-off-by: W. Trevor King &lt;wking@tremily.us&gt;
diff --git a/proto/config.json b/proto/config.json
@@ -20,5 +20,12 @@
     ],
     "cwd": "/"
   },
-  "hostname": ""
+  "hostname": "",
+  "linuxx": {
+    "capabilities": [
+      "CAP_AUDIT_WRITE",
+      "CAP_KILL",
+      "CAP_NET_BIND_SERVICE"
+    ]
+  }
 }
diff --git a/proto/config.proto b/proto/config.proto
@@ -20,15 +20,8 @@ message Spec {
 	// Mounts profile configuration for adding mounts to the container's
 	// filesystem.
 	repeated MountPoint mounts = 6;
-}
-
-
-// LinuxSpec is the full specification for linux containers.
-message LinuxSpec {
-	Spec spec = 1;
-	// LinuxConfig is platform specific configuration for linux based
-	// containers.
-	LinuxConfig linux_config = 2;
+	// LinuxConfig is the Linux-specific, host-independent configuration.
+	LinuxConfig linuxx = 7;
 }
 
 // LinuxConfig contains platform specific configuration for linux based
