Merge lp:~mvo/snappy/snappy-15.04-fs-compat into lp:~snappy-dev/snappy/snappy-moved-to-github

Proposed by Michael Vogt
Status: Rejected
Rejected by: Michael Vogt
Proposed branch: lp:~mvo/snappy/snappy-15.04-fs-compat
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 19 lines (+2/-2)
1 file modified
snappy/systemimage.go (+2/-2)
To merge this branch: bzr merge lp:~mvo/snappy/snappy-15.04-fs-compat
Reviewer Review Type Date Requested Status
Snappy Developers Pending
Review via email: mp+270976@code.launchpad.net

Description of the change

This branch adds back 15.04 compatibility by using the system-image paths available on both 15.04 and wily.

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

We have s-i 3.0 now in vivid

Unmerged revisions

683. By Michael Vogt

snappy/systemimage.go: use system image config path that is available on 15.04 and wily

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'snappy/systemimage.go'
--- snappy/systemimage.go 2015-09-09 16:55:11 +0000
+++ snappy/systemimage.go 2015-09-14 15:01:17 +0000
@@ -49,13 +49,13 @@
49 // This file specifies the s-i version installed on the rootfs49 // This file specifies the s-i version installed on the rootfs
50 // and hence s-i updates this file on every update applied to50 // and hence s-i updates this file on every update applied to
51 // the rootfs (by unpacking file "version-$version.tar.xz").51 // the rootfs (by unpacking file "version-$version.tar.xz").
52 systemImageChannelConfig = "/etc/system-image/config.d/01_channel.ini"52 systemImageChannelConfig = "/etc/system-image/channel.ini"
5353
54 // location of the client config.54 // location of the client config.
55 //55 //
56 // The full path to this file needs to be passed to56 // The full path to this file needs to be passed to
57 // systemImageCli when querying a different rootfs.57 // systemImageCli when querying a different rootfs.
58 systemImageClientConfig = "/etc/system-image/config.d/00_default.ini"58 systemImageClientConfig = "/etc/system-image/client.ini"
59)59)
6060
61var (61var (

Subscribers

People subscribed via source and target branches