Merge lp:~sergiusens/goget-ubuntu-touch/modprobe-orig-files into lp:goget-ubuntu-touch

[Sergio Schvezov]

Copy original files from modprobe.d

I'm not sure we want this (as we can't un-blacklist anything declared here), but at least it is backwards compatible.

[Michael Vogt (mvo)]

Looks good, thanks for your help on irc understanding this.

review: Approve

[Sergio Schvezov (sergiusens)]

approving merge

review: Approve

=== modified file 'ubuntu-device-flash/core.go'
--- ubuntu-device-flash/core.go	2015-09-09 14:36:46 +0000
+++ ubuntu-device-flash/core.go	2015-09-09 19:26:27 +0000
@@ -17,6 +17,8 @@
 	"path/filepath"
 	"strings"
 	"time"
+
+	"launchpad.net/snappy/helpers"
 )
 
 // This program is free software: you can redistribute it and/or modify it
@@ -100,6 +102,12 @@
 		return err
 	}
 
+	// first we need to copy all the files in modprobe.d
+	systemModprobeDir := filepath.Join(coreCmd.img.System(), "etc", "modprobe.d")
+	if err := helpers.RSyncWithDelete(systemModprobeDir, modprobeDir); err != nil {
+		return err
+	}
+
 	modprobeD := filepath.Join(modprobeDir, "ubuntu-core.conf")
 	modprobeDFile, err := os.Create(modprobeD)
 	if err != nil {