container: fix jujud arguments.

cmd/jujud/machine.go

 package main
 
 import (
         "fmt"
         "launchpad.net/gnuflag"
         "launchpad.net/juju-core/cmd"
         "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/log"
         "launchpad.net/juju-core/state"
         "launchpad.net/juju-core/worker/machiner"
@@ skipping 32 matching lines @@
         return a.tomb.Wait()
 }
 
 // Run runs a machine agent.
 func (a *MachineAgent) Run(_ *cmd.Context) error {
         defer a.tomb.Done()
         for a.tomb.Err() == tomb.ErrStillAlive {
                 log.Printf("machine agent starting")
                 err := a.runOnce()
                 if ug, ok := err.(*UpgradedError); ok {
-                        tools, err1 := environs.ChangeAgentTools(a.Conf.VarDir, "machine", ug.Binary)
+                        tools, err1 := environs.ChangeAgentTools(a.Conf.DataDir, "machine", ug.Binary)
                         if err1 == nil {
                                 log.Printf("exiting to upgrade to %v from %q", tools.Binary, tools.URL)
                                 // Return and let upstart deal with the restart.
                                 return nil
                         }
                         err = err1
                 }
                 select {
                 case <-a.tomb.Dying():
                         a.tomb.Kill(err)
                 case <-time.After(retryDelay):
                         log.Printf("restarting machiner after error: %v", err)
                 }
         }
         return a.tomb.Err()
 }
 
 func (a *MachineAgent) runOnce() error {
         st, err := state.Open(&a.Conf.StateInfo)
         if err != nil {
                 return err
         }
         defer st.Close()
         m, err := st.Machine(a.MachineId)
         if err != nil {
                 return err
         }
         return runTasks(a.tomb.Dying(),
-                machiner.NewMachiner(m, &a.Conf.StateInfo, a.Conf.VarDir),
-                NewUpgrader(st, m, a.Conf.VarDir),
+                machiner.NewMachiner(m, &a.Conf.StateInfo, a.Conf.DataDir),
+                NewUpgrader(st, m, a.Conf.DataDir),
         )
 }