Fixed passing display number 0

networking
xSmurf 10 years ago
parent 04214b4506
commit b1431b1554

@ -75,9 +75,7 @@ func createInitCommand(name, chroot string, uid uint32, display int, stn *networ
cmd.Env = append(cmd.Env, "INIT_GATEWAY=" + stn.Gateway.String() + "/" + stn.Class) cmd.Env = append(cmd.Env, "INIT_GATEWAY=" + stn.Gateway.String() + "/" + stn.Class)
} }
if display > 0 {
cmd.Env = append(cmd.Env, fmt.Sprintf("INIT_DISPLAY=%d", display)) cmd.Env = append(cmd.Env, fmt.Sprintf("INIT_DISPLAY=%d", display))
}
return cmd return cmd
} }

@ -162,10 +162,10 @@ func (st *initState) runInit() {
oz.ReapChildProcs(st.log, st.handleChildExit) oz.ReapChildProcs(st.log, st.handleChildExit)
if st.profile.XServer.Enabled { if st.profile.XServer.Enabled {
if st.display == 0 { //if st.display == 0 {
st.log.Error("Cannot start xpra because no display number was passed to oz-init") // st.log.Error("Cannot start xpra because no display number was passed to oz-init")
os.Exit(1) // os.Exit(1)
} //}
st.xpraReady.Add(1) st.xpraReady.Add(1)
st.startXpraServer() st.startXpraServer()
} }

Loading…
Cancel
Save