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

Fix for hostname of LXC not set correctly (#116) 

* Remove unnecessary script trim in jlmkr

* Update download script digest hash

* Bump version to 1.1.3

* Remove unused method

---------

Co-authored-by: Jip-Hop <2871973+Jip-Hop@users.noreply.github.com>
This commit is contained in:
Matthias Schabhüttl 2024-04-07 18:41:55 +02:00 committed by GitHub
parent 949c162fb7
commit f046dd3d32
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jlmkr.py
View File

@ -4,7 +4,7 @@
with full access to all files via bind mounts, \ with full access to all files via bind mounts, \
thanks to systemd-nspawn!""" thanks to systemd-nspawn!"""
__version__ = "1.1.2" __version__ = "1.1.3"
__disclaimer__ = """USE THIS SCRIPT AT YOUR OWN RISK! __disclaimer__ = """USE THIS SCRIPT AT YOUR OWN RISK!
IT COMES WITHOUT WARRANTY AND IS NOT SUPPORTED BY IXSYSTEMS.""" IT COMES WITHOUT WARRANTY AND IS NOT SUPPORTED BY IXSYSTEMS."""
@ -113,7 +113,7 @@ JAILS_DIR_PATH = "jails"
JAIL_CONFIG_NAME = "config" JAIL_CONFIG_NAME = "config"
JAIL_ROOTFS_NAME = "rootfs" JAIL_ROOTFS_NAME = "rootfs"
DOWNLOAD_SCRIPT_DIGEST = ( DOWNLOAD_SCRIPT_DIGEST = (
"d11fc7e5950d0e01bbca89ad8f663a698880ef7f4b0473453ba46a693cec4d12" "cfcb5d08b24187d108f2ab0d21a6cc4b73dcd7f5d7dfc80803bfd7f1642d638d"
) )
SCRIPT_PATH = os.path.realpath(__file__) SCRIPT_PATH = os.path.realpath(__file__)
SCRIPT_NAME = os.path.basename(SCRIPT_PATH) SCRIPT_NAME = os.path.basename(SCRIPT_PATH)
@ -787,22 +787,6 @@ def validate_sha256(file_path, digest):
return False return False
def remove_lines_after_line_number(file_path, line_number):
with open(file_path, "r+") as file:
current_line_number = 1
# Read the last line to keep
while current_line_number <= line_number:
file.readline()
current_line_number += 1
# Seek to the last line to keep
# https://stackoverflow.com/a/78176770
file.seek(file.tell())
# Remove everything after line_number
file.truncate()
def run_lxc_download_script( def run_lxc_download_script(
jail_name=None, jail_path=None, jail_rootfs_path=None, distro=None, release=None jail_name=None, jail_path=None, jail_rootfs_path=None, distro=None, release=None
): ):
@ -830,9 +814,6 @@ def run_lxc_download_script(
lxc_download_script, lxc_download_script,
) )
# Throw away the last part of the download script, jailmaker doesn't need it
remove_lines_after_line_number(lxc_download_script, 404)
if not validate_sha256(lxc_download_script, DOWNLOAD_SCRIPT_DIGEST): if not validate_sha256(lxc_download_script, DOWNLOAD_SCRIPT_DIGEST):
eprint("Abort! Downloaded script has unexpected contents.") eprint("Abort! Downloaded script has unexpected contents.")
return 1 return 1