almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

livemedia-creator: Make --make-oci work with --no-virt

Browse Source 
Also added a check to exit early if the config and runtime files don't
actually exist.
This commit is contained in:
Brian C. Lane 2015-10-20 14:23:33 -07:00
parent 88a2d9cc58
commit 6ccebefc26
1 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/sbin/livemedia-creator
View File

@ -563,6 +563,7 @@ def novirt_install(opts, disk_img, disk_size, repo_url):
or tarfile. or tarfile.
""" """
import selinux import selinux
dirinstall_path = ROOT_PATH
# Set selinux to Permissive if it is Enforcing # Set selinux to Permissive if it is Enforcing
selinux_enforcing = False selinux_enforcing = False
@ -589,17 +590,22 @@ def novirt_install(opts, disk_img, disk_size, repo_url):
args += ["--dirinstall"] args += ["--dirinstall"]
mkext4img(None, disk_img, label=opts.fs_label, size=disk_size * 1024**2) mkext4img(None, disk_img, label=opts.fs_label, size=disk_size * 1024**2)
if not os.path.isdir(ROOT_PATH): if not os.path.isdir(dirinstall_path):
os.mkdir(ROOT_PATH) os.mkdir(dirinstall_path)
mount(disk_img, opts="loop", mnt=ROOT_PATH) mount(disk_img, opts="loop", mnt=dirinstall_path)
elif opts.make_tar: elif opts.make_tar or opts.make_oci:
# Install under dirinstall_path, make sure it starts clean
if os.path.exists(dirinstall_path):
shutil.rmtree(dirinstall_path)
if opts.make_oci:
# OCI installs under /rootfs/
dirinstall_path = joinpaths(dirinstall_path, "rootfs")
args += ["--dirinstall", dirinstall_path]
else:
args += ["--dirinstall"] args += ["--dirinstall"]
# Install directly into ROOT_PATH, make sure it starts clean os.makedirs(dirinstall_path)
if os.path.exists(ROOT_PATH):
shutil.rmtree(ROOT_PATH)
if not os.path.isdir(ROOT_PATH):
os.mkdir(ROOT_PATH)
else: else:
args += ["--image", disk_img] args += ["--image", disk_img]
@ -619,14 +625,14 @@ def novirt_install(opts, disk_img, disk_size, repo_url):
log.info(line) log.info(line)
# Make sure the new filesystem is correctly labeled # Make sure the new filesystem is correctly labeled
args = ["-e", "/proc", "-e", "/sys", "-e", "/dev", setfiles_args = ["-e", "/proc", "-e", "/sys", "-e", "/dev",
"/etc/selinux/targeted/contexts/files/file_contexts", "/"] "/etc/selinux/targeted/contexts/files/file_contexts", "/"]
if opts.make_iso or opts.make_fsimage or opts.make_tar: if "--dirinstall" in args:
execWithRedirect("setfiles", args, root=ROOT_PATH) execWithRedirect("setfiles", setfiles_args, root=dirinstall_path)
else: else:
with PartitionMount(disk_img) as img_mount: with PartitionMount(disk_img) as img_mount:
if img_mount and img_mount.mount_dir: if img_mount and img_mount.mount_dir:
execWithRedirect("setfiles", args, root=img_mount.mount_dir) execWithRedirect("setfiles", setfiles_args, root=img_mount.mount_dir)
except (subprocess.CalledProcessError, OSError) as e: except (subprocess.CalledProcessError, OSError) as e:
log.error("Running anaconda failed: %s", e) log.error("Running anaconda failed: %s", e)
raise InstallError("novirt_install failed") raise InstallError("novirt_install failed")
@ -672,8 +678,21 @@ def novirt_install(opts, disk_img, disk_size, repo_url):
for arg in opts.compress_args: for arg in opts.compress_args:
compress_args += arg.split(" ", 1) compress_args += arg.split(" ", 1)
rc = mktar(dirinstall_path, disk_img, opts.compression, compress_args)
shutil.rmtree(dirinstall_path)
if rc:
raise InstallError("novirt_install mktar failed: rc=%s" % rc)
elif opts.make_oci:
# An OCI image places the filesystem under /rootfs/ and adds the json files at the top
# And then creates a tar of the whole thing.
compress_args = []
for arg in opts.compress_args:
compress_args += arg.split(" ", 1)
shutil.copy2(opts.oci_config, ROOT_PATH)
shutil.copy2(opts.oci_runtime, ROOT_PATH)
rc = mktar(ROOT_PATH, disk_img, opts.compression, compress_args) rc = mktar(ROOT_PATH, disk_img, opts.compression, compress_args)
shutil.rmtree(ROOT_PATH)
if rc: if rc:
raise InstallError("novirt_install mktar failed: rc=%s" % rc) raise InstallError("novirt_install mktar failed: rc=%s" % rc)
@ -1118,6 +1137,12 @@ def main():
if opts.make_oci and not (opts.oci_config and opts.oci_runtime): if opts.make_oci and not (opts.oci_config and opts.oci_runtime):
errors.append("--make-oci requires --oci-config and --oci-runtime") errors.append("--make-oci requires --oci-config and --oci-runtime")
if opts.make_oci and not os.path.exists(opts.oci_config):
errors.append("oci % file is missing" % opts.oci_config)
if opts.make_oci and not os.path.exists(opts.oci_runtime):
errors.append("oci % file is missing" % opts.oci_runtime)
if os.getuid() != 0: if os.getuid() != 0:
errors.append("You need to run this as root") errors.append("You need to run this as root")