Merge pull request docker-archive-public#1553 from jasisk/fix-conffile-error

nathanleclaire · nathanleclaire · commit 8046e13683f6 · 2016-02-23T19:22:07.000-08:00
Fix apt-get error on conf file conflict
diff --git a/libmachine/provision/ubuntu_upstart.go b/libmachine/provision/ubuntu_upstart.go
@@ -111,7 +111,7 @@ func (provisioner *UbuntuProvisioner) Package(name string, action pkgaction.Pack
 		}
 	}
 
-	command := fmt.Sprintf("DEBIAN_FRONTEND=noninteractive sudo -E apt-get %s -y  %s", packageAction, name)
+	command := fmt.Sprintf("DEBIAN_FRONTEND=noninteractive sudo -E apt-get %s -y -o Dpkg::Options::=\"--force-confnew\" %s", packageAction, name)
 
 	log.Debugf("package: action=%s name=%s", action.String(), name)
 

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func (provisioner *UbuntuProvisioner) Package(name string, action pkgaction.Pack`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`
`114`		`- command := fmt.Sprintf("DEBIAN_FRONTEND=noninteractive sudo -E apt-get %s -y %s", packageAction, name)`
	`114`	`+ command := fmt.Sprintf("DEBIAN_FRONTEND=noninteractive sudo -E apt-get %s -y -o Dpkg::Options::=\"--force-confnew\" %s", packageAction, name)`
`115`	`115`
`116`	`116`	`log.Debugf("package: action=%s name=%s", action.String(), name)`
`117`	`117`