Merge lp:~mvo/snappy/15.04-fix-off-by-one into lp:~snappy-dev/snappy/15.04-deprecated

[Michael Vogt]

Fix off-by-one error in the path handlng

Fix off-by-one error in the path handlng

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'coreconfig/config.go'
--- coreconfig/config.go	2015-09-10 06:29:34 +0000
+++ coreconfig/config.go	2015-09-10 06:29:34 +0000
@@ -281,7 +281,7 @@
 			return err
 		}
 		pc = append(pc, passthroughConfig{
-			Name:    path[len(rootDir)+1:],
+			Name:    path[len(rootDir):],
 			Content: string(content),
 		})
 		return nil
 
=== modified file 'coreconfig/config_test.go'
--- coreconfig/config_test.go	2015-09-10 06:29:34 +0000
+++ coreconfig/config_test.go	2015-09-10 06:29:34 +0000
@@ -79,8 +79,8 @@
 		return nil
 	}
 
-	networkRoot = c.MkDir()
-	pppRoot = c.MkDir()
+	networkRoot = c.MkDir() + "/"
+	pppRoot = c.MkDir() + "/"
 	watchdogConfigPath = filepath.Join(c.MkDir(), "watchdog-config")
 	watchdogStartupPath = filepath.Join(c.MkDir(), "watchdog-startup")
 }