fix for newer mesh
This commit is contained in:
parent
a5345e8468
commit
2ccacbe5f3
|
@ -51,7 +51,7 @@ def generate_linux_install(
|
|||
uri = get_mesh_ws_url()
|
||||
mesh_id = asyncio.run(get_mesh_device_id(uri, core.mesh_device_group))
|
||||
mesh_dl = (
|
||||
f"{core.mesh_site}/meshagents?id={mesh_id}&installflags=0&meshinstall={arch_id}"
|
||||
f"{core.mesh_site}/meshagents?id={mesh_id}&installflags=2&meshinstall={arch_id}"
|
||||
)
|
||||
|
||||
sh = settings.LINUX_AGENT_SCRIPT
|
||||
|
|
|
@ -85,14 +85,14 @@ InstallMesh() {
|
|||
wget --no-check-certificate -q -O ${meshTmpBin} ${meshDL}
|
||||
chmod +x ${meshTmpBin}
|
||||
mkdir -p ${meshDir}
|
||||
env LC_ALL=en_US.UTF-8 LANGUAGE=en_US ${meshTmpBin} -install --installPath=${meshDir}
|
||||
env LC_ALL=en_US.UTF-8 LANGUAGE=en_US XAUTHORITY=foo DISPLAY=bar ${meshTmpBin} -install --installPath=${meshDir}
|
||||
sleep 1
|
||||
rm -rf ${meshTmpDir}
|
||||
}
|
||||
|
||||
RemoveMesh() {
|
||||
if [ -f "${meshSystemBin}" ]; then
|
||||
${meshSystemBin} -uninstall
|
||||
env XAUTHORITY=foo DISPLAY=bar ${meshSystemBin} -uninstall
|
||||
sleep 1
|
||||
fi
|
||||
|
||||
|
@ -133,7 +133,7 @@ else
|
|||
InstallMesh
|
||||
sleep 2
|
||||
echo "Getting mesh node id..."
|
||||
MESH_NODE_ID=$(${agentBin} -m nixmeshnodeid)
|
||||
MESH_NODE_ID=$(env XAUTHORITY=foo DISPLAY=bar ${agentBin} -m nixmeshnodeid)
|
||||
fi
|
||||
|
||||
if [ ! -d "${agentBinPath}" ]; then
|
||||
|
|
Loading…
Reference in New Issue