Skip to content

Commit

Permalink
Fix #223
Browse files Browse the repository at this point in the history
  • Loading branch information
Jip-Hop committed Jul 18, 2024
1 parent 42a3251 commit 66b12a6
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions jlmkr.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
# https://manpages.debian.org/bookworm/manpages/sysfs.5.en.html

DOWNLOAD_SCRIPT_DIGEST = (
"cfcb5d08b24187d108f2ab0d21a6cc4b73dcd7f5d7dfc80803bfd7f1642d638d"
"645ba65a8846a2f402fc8bd870029b95fbcd3128e3046cd55642d577652cb0a0"
)
SCRIPT_PATH = os.path.realpath(__file__)
SCRIPT_NAME = os.path.basename(SCRIPT_PATH)
Expand Down Expand Up @@ -863,7 +863,7 @@ def run_lxc_download_script(
# Fetch the lxc download script if not present locally (or hash doesn't match)
if not validate_sha256(lxc_download_script, DOWNLOAD_SCRIPT_DIGEST):
urllib.request.urlretrieve(
"https://raw.githubusercontent.com/Jip-Hop/lxc/97f93be72ebf380f3966259410b70b1c966b0ff0/templates/lxc-download.in",
"https://raw.githubusercontent.com/Jip-Hop/lxc/b24d2d45b3875b013131b480e61c93b6fb8ea70c/templates/lxc-download.in",
lxc_download_script,
)

Expand Down Expand Up @@ -905,12 +905,7 @@ def run_lxc_download_script(
):
print(line)

rc = p1.wait()
# Currently --list will always return a non-zero exit code, even when listing the images was successful
# https://github.com/lxc/lxc/pull/4462
# Therefore we must currently return 0, to prevent aborting the interactive create process

# return rc
return p1.wait()

return 0

Expand Down

0 comments on commit 66b12a6

Please sign in to comment.