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

Always wait until jail stopped

This commit is contained in:
Jip-Hop 2024-02-16 10:39:48 +01:00
parent f37f6df7f7
commit 7be1c7c7d2
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jlmkr.py
View File

@ -266,14 +266,6 @@ def shell_jail(args):
""" """
return subprocess.run(["machinectl", "shell"] + args).returncode return subprocess.run(["machinectl", "shell"] + args).returncode
def stop_jail(jail_name):
"""
Stop jail with given name.
"""
return subprocess.run(["machinectl", "poweroff", jail_name]).returncode
def parse_config_string(config_string): def parse_config_string(config_string):
config = configparser.ConfigParser() config = configparser.ConfigParser()
# Workaround to read config file without section headers # Workaround to read config file without section headers
@ -525,7 +517,7 @@ def restart_jail(jail_name):
Restart jail with given name. Restart jail with given name.
""" """
returncode = stop_jail_and_wait(jail_name) returncode = stop_jail(jail_name)
if returncode != 0: if returncode != 0:
eprint("Abort restart.") eprint("Abort restart.")
return returncode return returncode
@ -1221,6 +1213,7 @@ def create_jail(jail_name="", config_path=None, distro="debian", release="bookwo
# Current echo 'y' workaround may cause problems when the jail name already exists # Current echo 'y' workaround may cause problems when the jail name already exists
# You'd end up with a new jail called 'y' # You'd end up with a new jail called 'y'
# and the script will crash at the agree statement below # and the script will crash at the agree statement below
# TODO: move this question higher, above the actual creating bit
print() print()
if agree(f"Do you want to start jail {jail_name} right now?", "y"): if agree(f"Do you want to start jail {jail_name} right now?", "y"):
return start_jail(jail_name) return start_jail(jail_name)
@ -1271,21 +1264,21 @@ def edit_jail(jail_name):
return 0 return 0
def stop_jail_and_wait(jail_name): def stop_jail(jail_name):
""" """
Wait for jail with given name to stop. Stop jail with given name and wait until stopped.
""" """
if not jail_is_running(jail_name): if not jail_is_running(jail_name):
return 0 return 0
returncode = stop_jail(jail_name) returncode = subprocess.run(["machinectl", "poweroff", jail_name]).returncode
if returncode != 0: if returncode != 0:
eprint("Error while stopping jail.") eprint("Error while stopping jail.")
return returncode return returncode
print(f"Wait for {jail_name} to stop", end="", flush=True) print(f"Wait for {jail_name} to stop", end="", flush=True)
# Need to sleep since deleting immediately after stop causes problems...
while jail_is_running(jail_name): while jail_is_running(jail_name):
time.sleep(1) time.sleep(1)
print(".", end="", flush=True) print(".", end="", flush=True)
@ -1310,7 +1303,7 @@ def remove_jail(jail_name):
if check == jail_name: if check == jail_name:
print() print()
jail_path = get_jail_path(jail_name) jail_path = get_jail_path(jail_name)
returncode = stop_jail_and_wait(jail_name) returncode = stop_jail(jail_name)
if returncode != 0: if returncode != 0:
return returncode return returncode