Merge lp:~sergiusens/goget-ubuntu-touch/BeLazy into lp:goget-ubuntu-touch

[Sergio Schvezov]

Lazy unmount when unmounting

[Ricardo Salveti (rsalveti)]

Still failing for me:

$ sudo ubuntu-device-flash core 15.04 --channel stable --oem generic-amd64 --install=webdm --enable-ssh --output ubuntu-15.04-snappy-amd64-generic.img
Determining oem configuration
Starting download of generic-amd64
40.93 KB / 40.93 KB [======================================================================================================================================================================================================================================] 100.00 % 58.64 KB/s
Done
Fetching information from server...
Downloading and setting up...
Installing generic-amd64
Starting download of generic-amd64
40.93 KB / 40.93 KB [======================================================================================================================================================================================================================================] 100.00 % 44.34 KB/s
Done
Installing webdm
Starting download of webdm
6.16 MB / 6.16 MB [========================================================================================================================================================================================================================================] 100.00 % 51.80 KB/s
Done
New image complete
Summary:
 Output: ubuntu-15.04-snappy-amd64-generic.img
 Architecture: amd64
 Channel: stable
 Version: 3
Launch by running: kvm -m 768 ubuntu-15.04-snappy-amd64-generic.img
Determining oem configuration
Starting download of generic-amd64
40.93 KB / 40.93 KB [======================================================================================================================================================================================================================================] 100.00 % 86.57 KB/s
Done
Fetching information from server...
Downloading and setting up...
panic: cannot double map partitions

goroutine 16 [running]:
runtime.panic(0x76b300, 0xc20823dac0)
 /usr/lib/go/src/pkg/runtime/panic.c:279 +0xf5
launchpad.net/goget-ubuntu-touch/diskimage.(*CoreGrubImage).Map(0xc208275400, 0x0, 0x0)
 /tmp/sergio/build-area/goget-ubuntu-touch-0.23/obj-x86_64-linux-gnu/src/launchpad.net/goget-ubuntu-touch/diskimage/core_grub.go:131 +0xc3
main.(*CoreCmd).setup(0xcf36c0, 0x7f1507884758, 0xc208275400, 0xc20826a1b0, 0x3, 0x0, 0x0)
 /tmp/sergio/build-area/goget-ubuntu-touch-0.23/obj-x86_64-linux-gnu/src/launchpad.net/goget-ubuntu-touch/ubuntu-device-flash/core.go:326 +0x10e
main.func·004(0x0, 0x0)
 /tmp/sergio/build-area/goget-ubuntu-touch-0.23/obj-x86_64-linux-gnu/src/launchpad.net/goget-ubuntu-touch/ubuntu-device-flash/core.go:280 +0x16b
main.(*CoreCmd).Execute(0xcf36c0, 0xc20800e210, 0x1, 0xb, 0x0, 0x0)
 /tmp/sergio/build-area/goget-ubuntu-touch-0.23/obj-x86_64-linux-gnu/src/launchpad.net/goget-ubuntu-touch/ubuntu-device-flash/core.go:285 +0x1b9d
github.com/jessevdk/go-flags.(*Parser).ParseArgs(0xc20804a800, 0xc20800e000, 0xb, 0xb, 0x0, 0x0, 0x0, 0x0, 0x0)
 /tmp/sergio/build-area/goget-ubuntu-touch-0.23/obj-x86_64-linux-gnu/src/github.com/jessevdk/go-flags/parser.go:241 +0x7cd
main.main()
 /tmp/sergio/build-area/goget-ubuntu-touch-0.23/obj-x86_64-linux-gnu/src/launchpad.net/goget-ubuntu-touch/ubuntu...

[Sergio Schvezov (sergiusens)]

> Still failing for me:

This error seems totally unrelated; can you run again (make sure to kpartx -ds /dev/loop[x])

Also add --verbose

[Oliver Grawert (ogra)]

works fine for me (after wrangling the whole day with this issue on the rpi image, i didnt even know about this MP :P )

[Ricardo Salveti (rsalveti)]

Couldn't reproduce anymore after trying this branch again (after a clean reboot).

review: Approve

=== modified file 'diskimage/core_grub.go'
--- diskimage/core_grub.go	2015-04-27 07:02:55 +0000
+++ diskimage/core_grub.go	2015-06-11 03:14:28 +0000
@@ -89,7 +89,7 @@
 		}
 
 		mountpoint := filepath.Join(img.baseMount, string(part.dir))
-		if out, err := exec.Command("umount", mountpoint).CombinedOutput(); err != nil {
+		if out, err := exec.Command("umount", "-l", mountpoint).CombinedOutput(); err != nil {
 			return fmt.Errorf("unable to unmount dir for image: %s", out)
 		} else {
 		}

=== modified file 'diskimage/core_uboot.go'
--- diskimage/core_uboot.go	2015-04-23 16:54:36 +0000
+++ diskimage/core_uboot.go	2015-06-11 03:14:28 +0000
@@ -111,7 +111,7 @@
 
 	for _, part := range img.parts {
 		mountpoint := filepath.Join(img.baseMount, string(part.dir))
-		if out, err := exec.Command("umount", mountpoint).CombinedOutput(); err != nil {
+		if out, err := exec.Command("umount", "-l", mountpoint).CombinedOutput(); err != nil {
 			panic(fmt.Sprintf("unable to unmount dir for image: %s", out))
 		}
 	}