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

[Michael Vogt]

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

[Michael Vogt (mvo)]

We have s-i 3.0 now in vivid

Unmerged revisions

683. By Michael Vogt on 2015-09-14

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

=== 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 @@
 	// This file specifies the s-i version installed on the rootfs
 	// and hence s-i updates this file on every update applied to
 	// the rootfs (by unpacking file "version-$version.tar.xz").
-	systemImageChannelConfig = "/etc/system-image/config.d/01_channel.ini"
+	systemImageChannelConfig = "/etc/system-image/channel.ini"
 
 	// location of the client config.
 	//
 	// The full path to this file needs to be passed to
 	// systemImageCli when querying a different rootfs.
-	systemImageClientConfig = "/etc/system-image/config.d/00_default.ini"
+	systemImageClientConfig = "/etc/system-image/client.ini"
 )
 
 var (