diff --git a/oz-daemon/daemon.go b/oz-daemon/daemon.go index abeea25..1df5dd5 100644 --- a/oz-daemon/daemon.go +++ b/oz-daemon/daemon.go @@ -93,7 +93,6 @@ func initialize() *daemonState { return d } - func (d *daemonState) loadConfig() (*oz.Config, error) { config, err := oz.LoadConfig(oz.DefaultConfigPath) if err != nil { @@ -348,21 +347,21 @@ func (d *daemonState) handleNetworkReconfigure() { d.log.Error("Unable to reconfigure bridge network: %v", err) return } -/* - for _, sbox := range d.sandboxes { - if sbox.profile.Networking.Nettype == network.TYPE_BRIDGE { - sbox.network, err := network.PrepareSandboxNetwork(d.network, d.log) - if err != nil { - d.log.Error("Unable to prepare reconfigure of sandbox `%s` networking: %v", sbox.profile.Name, err) - continue - } - if err := d.network.NetReconfigure(d.network, sbox.network, sbox.Pid, d.log); err != nil { - d.log.Error("Unable to reconfigure sandbox `%s` networking: %v", sbox.profile.Name, err) - continue + /* + for _, sbox := range d.sandboxes { + if sbox.profile.Networking.Nettype == network.TYPE_BRIDGE { + sbox.network, err := network.PrepareSandboxNetwork(d.network, d.log) + if err != nil { + d.log.Error("Unable to prepare reconfigure of sandbox `%s` networking: %v", sbox.profile.Name, err) + continue + } + if err := d.network.NetReconfigure(d.network, sbox.network, sbox.Pid, d.log); err != nil { + d.log.Error("Unable to reconfigure sandbox `%s` networking: %v", sbox.profile.Name, err) + continue + } + // TODO: Reconfigure default gateway inside sandbox } - // TODO: Reconfigure default gateway inside sandbox } - } -*/ + */ return } diff --git a/oz-daemon/launch.go b/oz-daemon/launch.go index a2b3971..c0043e1 100644 --- a/oz-daemon/launch.go +++ b/oz-daemon/launch.go @@ -226,7 +226,7 @@ func (sbox *Sandbox) whitelistArgumentFiles(binpath, pwd string, args []string, pmnt := path.Join(binpath, "bin", "oz-mount") cmnt := exec.Command(pmnt, files...) cmnt.Env = []string{"_OZ_NSPID=" + strconv.Itoa(sbox.init.Process.Pid)} - pout, err := cmnt.CombinedOutput(); + pout, err := cmnt.CombinedOutput() if err != nil { log.Warning("Unable to bind files to sandbox: %v", err) log.Warning("%s", string(pout))