Snappy

Merge lp:~sergiusens/snappy/bootCorrectlyAfterBroken into lp:~snappy-dev/snappy/snappy-moved-to-github

  1. bootCorrectlyAfterBroken
  2. Merge into snappy-moved-to-github
Proposed by Sergio Schvezov
Status: Merged
Approved by: Michael Vogt
Approved revision: 432
Merged at revision: 432
Proposed branch: lp:~sergiusens/snappy/bootCorrectlyAfterBroken
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 65 lines (+16/-1)
4 files modified
partition/bootloader_grub.go (+5/-0)
partition/bootloader_grub_test.go (+6/-1)
partition/bootloader_uboot.go (+3/-0)
partition/bootloader_uboot_test.go (+2/-0)
To merge this branch: bzr merge lp:~sergiusens/snappy/bootCorrectlyAfterBroken
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+257877@code.launchpad.net

Commit message

Marking the ab partition on successful boots in case we come back from a broken boot

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Yay, thank you very much! This fixes https://bugs.launchpad.net/snappy-ubuntu/+bug/1449904

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'partition/bootloader_grub.go'
2--- partition/bootloader_grub.go 2015-03-31 10:41:47 +0000
3+++ partition/bootloader_grub.go 2015-04-30 12:31:10 +0000
4@@ -139,6 +139,11 @@
5 if err := g.unsetBootVar(bootloaderGrubTrialBootVar); err != nil {
6 return err
7 }
8+
9+ if err := g.setBootVar(bootloaderRootfsVar, g.currentRootfs); err != nil {
10+ return err
11+ }
12+
13 return g.setBootVar(bootloaderBootmodeVar, bootloaderBootmodeSuccess)
14 }
15
16
17=== modified file 'partition/bootloader_grub_test.go'
18--- partition/bootloader_grub_test.go 2015-04-14 20:37:54 +0000
19+++ partition/bootloader_grub_test.go 2015-04-30 12:31:10 +0000
20@@ -150,7 +150,12 @@
21
22 c.Assert(allCommands[1], DeepEquals, expectedGrubSet)
23
24- expectedGrubSet2 := singleCommand{bootloaderGrubEnvCmd, bootloaderGrubEnvFile, "set", "snappy_mode=regular"}
25+ expectedGrubSet2 := singleCommand{bootloaderGrubEnvCmd, bootloaderGrubEnvFile, "set", "snappy_ab=a"}
26
27 c.Assert(allCommands[2], DeepEquals, expectedGrubSet2)
28+
29+ expectedGrubSet3 := singleCommand{bootloaderGrubEnvCmd, bootloaderGrubEnvFile, "set", "snappy_mode=regular"}
30+
31+ c.Assert(allCommands[3], DeepEquals, expectedGrubSet3)
32+
33 }
34
35=== modified file 'partition/bootloader_uboot.go'
36--- partition/bootloader_uboot.go 2015-04-29 09:01:48 +0000
37+++ partition/bootloader_uboot.go 2015-04-30 12:31:10 +0000
38@@ -202,6 +202,9 @@
39 configFileChange{Name: bootloaderBootmodeVar,
40 Value: bootloaderBootmodeSuccess,
41 },
42+ configFileChange{Name: bootloaderRootfsVar,
43+ Value: string(u.currentRootfs),
44+ },
45 }
46
47 if err := modifyNameValueFile(bootloaderUbootEnvFile, changes); err != nil {
48
49=== modified file 'partition/bootloader_uboot_test.go'
50--- partition/bootloader_uboot_test.go 2015-04-14 20:37:54 +0000
51+++ partition/bootloader_uboot_test.go 2015-04-30 12:31:10 +0000
52@@ -275,6 +275,7 @@
53 c.Assert(err, IsNil)
54 c.Assert(strings.Contains(string(bytes), "snappy_mode=try"), Equals, true)
55 c.Assert(strings.Contains(string(bytes), "snappy_mode=regular"), Equals, false)
56+ c.Assert(strings.Contains(string(bytes), "snappy_ab=b"), Equals, true)
57
58 err = u.MarkCurrentBootSuccessful()
59 c.Assert(err, IsNil)
60@@ -286,4 +287,5 @@
61 c.Assert(err, IsNil)
62 c.Assert(strings.Contains(string(bytes), "snappy_mode=try"), Equals, false)
63 c.Assert(strings.Contains(string(bytes), "snappy_mode=regular"), Equals, true)
64+ c.Assert(strings.Contains(string(bytes), "snappy_ab=a"), Equals, true)
65 }

Subscribers

People subscribed via source and target branches