Cloned2Preserve
/
jailmaker
mirror of https://github.com/Jip-Hop/jailmaker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Formatting

This commit is contained in:
Jip-Hop 2023-08-15 17:40:10 +02:00
parent 757ac5d297
commit f14ace1f38
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jlmkr.py
View File

@ -407,7 +407,7 @@ def run_lxc_download_script(jail_name=None, jail_path=None, jail_rootfs_path=Non
fail("Abort! Downloaded script has unexpected contents.") fail("Abort! Downloaded script has unexpected contents.")
stat_chmod(lxc_download_script, 0o700) stat_chmod(lxc_download_script, 0o700)
check_exit_code = False check_exit_code = False
if None not in [jail_name, jail_path, jail_rootfs_path, distro, release]: if None not in [jail_name, jail_path, jail_rootfs_path, distro, release]:
@ -417,16 +417,17 @@ def run_lxc_download_script(jail_name=None, jail_path=None, jail_rootfs_path=Non
else: else:
cmd = [lxc_download_script, '--list', f'--arch={arch}'] cmd = [lxc_download_script, '--list', f'--arch={arch}']
p1 = subprocess.Popen(cmd, stdout=subprocess.PIPE, env={"LXC_CACHE_PATH": lxc_cache}) p1 = subprocess.Popen(cmd, stdout=subprocess.PIPE, env={
"LXC_CACHE_PATH": lxc_cache})
for line in iter(p1.stdout.readline, b''): for line in iter(p1.stdout.readline, b''):
line = line.decode().strip() line = line.decode().strip()
# Filter out the known incompatible distros # Filter out the known incompatible distros
if not re.match(r"^(alpine|amazonlinux|busybox|devuan|funtoo|openwrt|plamo|voidlinux)\s", line): if not re.match(r"^(alpine|amazonlinux|busybox|devuan|funtoo|openwrt|plamo|voidlinux)\s", line):
print(line) print(line)
p1.wait() p1.wait()
if check_exit_code and p1.returncode != 0: if check_exit_code and p1.returncode != 0:
fail("Aborting...") fail("Aborting...")