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

Fix jail create error

This commit is contained in:
Jip-Hop 2023-08-15 08:07:36 +02:00
parent b2a333643c
commit fef8e15f40
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jlmkr.py
View File

@ -7,6 +7,7 @@ import ctypes
import glob import glob
import hashlib import hashlib
import os import os
import platform
import re import re
import readline import readline
import shlex import shlex
@ -444,7 +445,7 @@ def check_jail_name_available(jail_name, warn=True):
return False return False
def create_jail(jail_name): def create_jail(jail_name, distro='debian', release='bullseye'):
""" """
Create jail with given name. Create jail with given name.
""" """
@ -475,7 +476,7 @@ def create_jail(jail_name):
stat_chmod(JAILS_DIR_PATH, 0o700) stat_chmod(JAILS_DIR_PATH, 0o700)
print() print()
if not agree("Install the recommended distro (Debian 11)?", 'y'): if not agree(f"Install the recommended image ({distro} {release})?", 'y'):
print(dedent(f""" print(dedent(f"""
{YELLOW}{BOLD}WARNING: ADVANCED USAGE{NORMAL} {YELLOW}{BOLD}WARNING: ADVANCED USAGE{NORMAL}
@ -558,9 +559,10 @@ def create_jail(jail_name):
if agree('Show the man page for systemd-nspawn?', 'n'): if agree('Show the man page for systemd-nspawn?', 'n'):
os.system("man systemd-nspawn") os.system("man systemd-nspawn")
else: else:
base_os_version = platform.freedesktop_os_release().get('VERSION_CODENAME', release)
print(dedent(f""" print(dedent(f"""
You may read the systemd-nspawn manual online: You may read the systemd-nspawn manual online:
https://manpages.debian.org/{release}/systemd-container/systemd-nspawn.1.en.html""")) https://manpages.debian.org/{base_os_version}/systemd-container/systemd-nspawn.1.en.html"""))
# Backslashes and colons need to be escaped in bind mount options: # Backslashes and colons need to be escaped in bind mount options:
# e.g. to bind mount a file called: # e.g. to bind mount a file called: