← Back to branch summary

~mvo/snappy/15.04-envvar_store_id

« back to all changes in this revision

Viewing changes to partition/bootloader_grub.go

Backports of the uboot.env changes from trunk. by mvo approved by chipaca

Show diffs side-by-side

added added

removed removed

Lines of Context:
partition/bootloader_grub.go
30
30
        bootloaderGrubConfigFileReal = "/boot/grub/grub.cfg"
31
31
        bootloaderGrubEnvFileReal    = "/boot/grub/grubenv"
32
32
 
33
 
        bootloaderGrubEnvCmdReal       = "/usr/bin/grub-editenv"
34
 
        bootloaderGrubUpdateCmdReal    = "/usr/sbin/update-grub"
35
 
        bootloaderGrubTrialBootVarReal = "snappy_trial_boot"
 
33
        bootloaderGrubEnvCmdReal    = "/usr/bin/grub-editenv"
 
34
        bootloaderGrubUpdateCmdReal = "/usr/sbin/update-grub"
36
35
)
37
36
 
38
37
// var to make it testable
39
38
var (
40
 
        bootloaderGrubDir          = bootloaderGrubDirReal
41
 
        bootloaderGrubConfigFile   = bootloaderGrubConfigFileReal
42
 
        bootloaderGrubTrialBootVar = bootloaderGrubTrialBootVarReal
43
 
        bootloaderGrubEnvFile      = bootloaderGrubEnvFileReal
 
39
        bootloaderGrubDir        = bootloaderGrubDirReal
 
40
        bootloaderGrubConfigFile = bootloaderGrubConfigFileReal
 
41
        bootloaderGrubEnvFile    = bootloaderGrubEnvFileReal
44
42
 
45
43
        bootloaderGrubEnvCmd    = bootloaderGrubEnvCmdReal
46
44
        bootloaderGrubUpdateCmd = bootloaderGrubUpdateCmdReal
136
134
func (g *grub) MarkCurrentBootSuccessful() (err error) {
137
135
        // Clear the variable set by grub on boot to denote a good
138
136
        // boot.
139
 
        if err := g.unsetBootVar(bootloaderGrubTrialBootVar); err != nil {
 
137
        if err := g.unsetBootVar(bootloaderTrialBootVar); err != nil {
140
138
                return err
141
139
        }
142
140