model: add Version field

The mass-installer use case for image generation requires to specify the target system version. This patch allows the configuration of an arbitrary version. Signed-off-by: Leandro Dorileo <[email protected]>
be-we · Sep 27, 2018 · a26b541 · a26b541
1 parent a58c12d
commit a26b541
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 12 deletions.
diff --git a/controller/controller.go b/controller/controller.go
@@ -80,22 +80,27 @@ func Install(rootDir string, model *model.SystemInstall) error {
  }
  }
 
- log.Info("Querying Clear Linux version")
+ if model.Version == 0 {
+ log.Info("Querying Clear Linux version")
+
+ // in order to avoid issues raised by format bumps between installers image
+ // version and the latest released we assume the installers host version
+ // in other words we use the same version swupd is based on
+ if versionBuf, err = ioutil.ReadFile("/usr/lib/os-release"); err != nil {
+ return errors.Errorf("Read version file /usr/lib/os-release: %v", err)
+ }
+ versionExp := regexp.MustCompile(`VERSION_ID=([0-9][0-9]*)`)
+ match := versionExp.FindSubmatch(versionBuf)
 
- // in order to avoid issues raised by format bumps between installers image
- // version and the latest released we assume the installers host version
- // in other words we use the same version swupd is based on
- if versionBuf, err = ioutil.ReadFile("/usr/lib/os-release"); err != nil {
- return errors.Errorf("Read version file /usr/lib/os-release: %v", err)
- }
- versionExp := regexp.MustCompile(`VERSION_ID=([0-9][0-9]*)`)
- match := versionExp.FindSubmatch(versionBuf)
+ if len(match) < 2 {
+ return errors.Errorf("Version not found in /usr/lib/os-release")
+ }
 
- if len(match) < 2 {
- return errors.Errorf("Version not found in /usr/lib/os-release")
+ version = string(match[1])
+ } else {
+ version = fmt.Sprintf("%d", model.Version)
  }
 
- version = string(match[1])
  log.Debug("Clear Linux version: %s", version)
 
  // do we have the minimum required to install a system?

diff --git a/massinstall/massinstall.go b/massinstall/massinstall.go
@@ -120,6 +120,10 @@ func (mi *MassInstall) Run(md *model.SystemInstall, rootDir string) (bool, error
 
  log.Debug("Starting install")
 
+ if md.Version > 0 {
+ fmt.Printf("Config file specifies a target \"version\", forcing auto-update off.")
+ }
+
  instError = controller.Install(rootDir, md)
  if instError != nil {
  if !errors.IsValidationError(instError) {

diff --git a/model/model.go b/model/model.go
@@ -52,6 +52,7 @@ type SystemInstall struct {
  TelemetryPolicy string `yaml:"telemetryPolicy,omitempty,flow"`
  PreInstall []*InstallHook `yaml:"pre-install,omitempty,flow"`
  PostInstall []*InstallHook `yaml:"post-install,omitempty,flow"`
+ Version uint `yaml:"version,omitempty,flow"`
 }
 
 // InstallHook is a commands to be executed in a given point of the install process
@@ -230,6 +231,10 @@ func LoadFile(path string) (*SystemInstall, error) {
  }
  }
 
+ if result.Version > 0 {
+ result.AutoUpdate = false
+ }
+
  return &result, nil
 }
 

diff --git a/model/model_test.go b/model/model_test.go
@@ -38,6 +38,7 @@ func TestLoadFile(t *testing.T) {
  {"real-example.yaml", true},
  {"valid-network.yaml", true},
  {"valid-minimal.yaml", true},
+ {"valid-with-version.yaml", true},
  }
 
  for _, curr := range tests {

diff --git a/tests/valid-with-version.yaml b/tests/valid-with-version.yaml
@@ -0,0 +1,26 @@
+#clear-linux-config
+targetMedia:
+- name: sda
+ size: "30752636928"
+ type: disk
+ children:
+ - name: sda1
+ fstype: vfat
+ mountpoint: /boot
+ size: "157286400"
+ type: part
+ - name: sda2
+ fstype: swap
+ size: "2147483648"
+ type: part
+ - name: sda3
+ fstype: ext4
+ mountpoint: /
+ size: "28447866880"
+ type: part
+bundles: [os-core, os-core-update]
+telemetry: false
+keyboard: us
+language: en_US.UTF-8
+kernel: kernel-native
+version: 1010