Merge lp:~mvo/snappy/snappy-lp1476129-boot-ok into lp:~snappy-dev/snappy/snappy-moved-to-github

[Michael Vogt]

Move ubuntu-snappy.boot-ok after multi-user.target (LP: 1476129)

This branch fixes the failover for bugs during the boot by moving the ubuntu-snappy.boot-ok.service after the multi-user.target. It also re-enables the integration test for this.

[John Lenton (chipaca)]

This seems sane to me, but could use fgimenez/elopio's look also.

review: Approve

[Federico Gimenez (fgimenez)]

Doesn't work for me on bbb, rolling/edge #160. This is the console log [1], after the test sets the fail conditions it keeps trying to boot on b and showing this same log.

It's failing now for kvm too (rolling/edge #164)

Thanks,

[1] http://paste.ubuntu.com/12305930/

[Federico Gimenez (fgimenez)]

It seems that this branch was merged before disabling the test, it's reverted here [1]

Thanks!

[1]

[Federico Gimenez (fgimenez)]

https://code.launchpad.net/~fgimenez/snappy/comment-rc-local-crash-test/+merge/270485

=== modified file '_integration-tests/tests/failover_rclocal_crash_test.go'
--- _integration-tests/tests/failover_rclocal_crash_test.go	2015-07-30 16:22:30 +0000
+++ _integration-tests/tests/failover_rclocal_crash_test.go	2015-08-26 14:35:36 +0000
@@ -44,11 +44,6 @@
 	ExecCommand(c, "sudo", "rm", fmt.Sprintf("%s/etc/rc.local", BaseAltPartitionPath))
 }
 
-/*
-TODO: uncomment when bug https://bugs.launchpad.net/snappy/+bug/1476129 is fixed
-(fgimenez 20150728)
-
 func (s *failoverSuite) TestRCLocalCrash(c *check.C) {
 	commonFailoverTest(c, rcLocalCrash{})
 }
-*/

=== modified file 'debian/ubuntu-snappy.boot-ok.service'
--- debian/ubuntu-snappy.boot-ok.service	2015-03-27 08:28:08 +0000
+++ debian/ubuntu-snappy.boot-ok.service	2015-08-26 14:35:36 +0000
@@ -1,5 +1,6 @@
 [Unit]
 Description=Notify bootloader that boot was successful
+After=multi-user.target
 
 [Service]
 Type=oneshot