particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osbuild: convert to jsoncomm

Browse source 
Convert the hard-coded DGRAM communication to util.jsoncomm. This
avoids hard-coding any IPC-details and simplifies the callers quite a
bit.
This commit is contained in:
David Rheinsberg 2020-04-09 13:40:28 +02:00 • committed by Tom Gundersen
parent 6f8ba82fc6
commit 4ad4da4658
10 changed files with 79 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

8
assemblers/org.osbuild.qemu
View file

@ -3,7 +3,6 @@
import contextlib
import json
import os
import socket
import shutil
import struct
import subprocess
@ -685,10 +684,5 @@ def main(tree, output_dir, options, loop_client):
if __name__ == '__main__':
args = json.load(sys.stdin)
with socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) as sock:
sock.setsockopt(socket.SOL_SOCKET, socket.SO_PASSCRED, 1)
sock.connect("/run/osbuild/api/remoteloop")
ret = main(args["tree"], args["output_dir"], args["options"], remoteloop.LoopClient(sock))
ret = main(args["tree"], args["output_dir"], args["options"], remoteloop.LoopClient("/run/osbuild/api/remoteloop"))
sys.exit(ret)

8
assemblers/org.osbuild.rawfs
View file

@ -3,7 +3,6 @@
import contextlib
import json
import os
import socket
import subprocess
import sys
import osbuild.remoteloop as remoteloop
@ -97,10 +96,5 @@ def main(tree, output_dir, options, loop_client):
if __name__ == '__main__':
args = json.load(sys.stdin)
with socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) as sock:
sock.setsockopt(socket.SOL_SOCKET, socket.SO_PASSCRED, 1)
sock.connect("/run/osbuild/api/remoteloop")
r = main(args["tree"], args["output_dir"], args["options"], remoteloop.LoopClient(sock))
r = main(args["tree"], args["output_dir"], args["options"], remoteloop.LoopClient("/run/osbuild/api/remoteloop"))
sys.exit(r)