Fix bug where upgrade would fail if VM is stopped.

Signed-off-by: Jeffrey Morgan <[email protected]>
docker-archive · Oct 30, 2015 · 8c128e7 · 8c128e7
1 parent 1f04b1e
commit 8c128e7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/osx/installerplugins/managevmplugin/managevmpluginPane.m b/osx/installerplugins/managevmplugin/managevmpluginPane.m
@@ -148,7 +148,7 @@ - (void) upgradeBoot2DockerVM {
     // Do the migration
     NSTask* task = [[NSTask alloc] init];
     task.launchPath = @"/usr/bin/sudo";
-    task.arguments = [NSArray arrayWithObjects:@"-i", @"-u", NSUserName(), [NSString stringWithFormat:@"%@ -D stop default && cp %@/.docker/machine/cache/boot2docker.iso %@/.docker/machine/machines/default/boot2docker.iso", dockerMachinePath, NSHomeDirectory(),  NSHomeDirectory()], nil];
+    task.arguments = [NSArray arrayWithObjects:@"-i", @"-u", NSUserName(), [NSString stringWithFormat:@"%@ -D stop default || true && cp %@/.docker/machine/cache/boot2docker.iso %@/.docker/machine/machines/default/boot2docker.iso", dockerMachinePath, NSHomeDirectory(),  NSHomeDirectory()], nil];
 
     [self runTask:task onFinish:^void (int status) {
         self.nextEnabled = YES;

diff --git a/osx/mpkg/Plugins/managevmplugin.bundle/Contents/MacOS/managevmplugin b/osx/mpkg/Plugins/managevmplugin.bundle/Contents/MacOS/managevmplugin