WIP: rework image builder code for x86
-rw-r--r-- 8201 default