diff options
| author | Michael Vogt <michael.vogt@gmail.com> | 2016-01-13 09:46:51 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@gmail.com> | 2016-01-13 09:46:51 +0100 |
| commit | b627ac7ba5af655e49da0326d4eb060b2bf89286 (patch) | |
| tree | dfc5cadbf8e83e3119aee9d9a118e7994c2f729b | |
| parent | fbaddb455e355f2962a9b58ebeeabb52969a0072 (diff) | |
| parent | 10ec7349d763fde97c5090aa83ea60aea054c750 (diff) | |
Merge pull request #315 from mvo5/feature/provisioning
add OS/Kernel to install.yaml
| -rw-r--r-- | provisioning/provisioning.go | 6 | ||||
| -rw-r--r-- | provisioning/provisioning_test.go | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/provisioning/provisioning.go b/provisioning/provisioning.go index 771080edde..1ebcde5ac7 100644 --- a/provisioning/provisioning.go +++ b/provisioning/provisioning.go @@ -49,9 +49,7 @@ func (e *ErrNoInstallYaml) Error() string { // InstallMeta encapsulates the metadata for a system install. type InstallMeta struct { - Timestamp time.Time - InitialVersion string `yaml:"initial-version"` - SystemImageServer string `yaml:"system-image-server"` + Timestamp time.Time } // InstallTool encapsulates metadata on the tool used to create the @@ -70,6 +68,8 @@ type InstallOptions struct { Channel string DevicePart string `yaml:"device-part,omitempty"` Gadget string + OS string + Kernel string DeveloperMode bool `yaml:"developer-mode,omitempty"` } diff --git a/provisioning/provisioning_test.go b/provisioning/provisioning_test.go index 0013ec99cc..eb767e9f29 100644 --- a/provisioning/provisioning_test.go +++ b/provisioning/provisioning_test.go @@ -39,8 +39,6 @@ var _ = Suite(&ProvisioningTestSuite{}) var yamlData = ` meta: timestamp: 2015-04-20T14:15:39.013515821+01:00 - initial-revision: r345 - system-image-server: http://system-image.ubuntu.com tool: name: ubuntu-device-flash @@ -59,8 +57,6 @@ options: var yamlDataNoDevicePart = ` meta: timestamp: 2015-04-20T14:15:39.013515821+01:00 - initial-revision: r345 - system-image-server: http://system-image.ubuntu.com tool: name: ubuntu-device-flash |