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

livemedia-creator: Stop passing --repo to anaconda (#1304802)

Browse Source 
When running a no-virt installation it was parsing the kickstart url
method and passing it to anaconda using --repo which prevents it from
working with url --mirrorlist method. There is no good reason to do
this, anaconda gets the method directly from the kickstart when it isn't
on the cmdline.
This commit is contained in:
Brian C. Lane 2016-02-11 10:20:09 -08:00
parent c15349c3da
commit 7c0a6dffd6
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/sbin/livemedia-creator
View File

@ -600,7 +600,7 @@ def novirt_log_check(log_check, proc):
return False return False
def novirt_install(opts, disk_img, disk_size, repo_url): def novirt_install(opts, disk_img, disk_size):
""" """
Use Anaconda to install to a disk image Use Anaconda to install to a disk image
@ -608,7 +608,6 @@ def novirt_install(opts, disk_img, disk_size, repo_url):
:type opts: argparse options :type opts: argparse options
:param str disk_img: The full path to the disk image to be created :param str disk_img: The full path to the disk image to be created
:param int disk_size: The size of the disk_img in MiB :param int disk_size: The size of the disk_img in MiB
:param str repo_url: The url of the repository to use for the installation
This method makes sure SELinux is permissive during the install, runs anaconda This method makes sure SELinux is permissive during the install, runs anaconda
to create the image and then based on the opts passed create a qemu disk image to create the image and then based on the opts passed create a qemu disk image
@ -628,7 +627,7 @@ def novirt_install(opts, disk_img, disk_size, repo_url):
if os.path.isdir(path): if os.path.isdir(path):
shutil.rmtree(path) shutil.rmtree(path)
args = ["--kickstart", opts.ks[0], "--cmdline", "--repo", repo_url] args = ["--kickstart", opts.ks[0], "--cmdline"]
if opts.anaconda_args: if opts.anaconda_args:
for arg in opts.anaconda_args: for arg in opts.anaconda_args:
args += arg.split(" ", 1) args += arg.split(" ", 1)
@ -951,18 +950,7 @@ def make_image(opts, ks):
try: try:
if opts.no_virt: if opts.no_virt:
method = ks.handler.method novirt_install(opts, disk_img, disk_size)
if method.method == "url":
repo_url = method.url
elif method.method == "nfs":
if method.opts:
repo_url = "nfs:%s:%s:%s" % (method.opts, method.server, method.dir)
else:
repo_url = "nfs:%s:%s" % (method.server, method.dir)
else:
raise InstallError("Unsupported installation method: %s" % method.method)
novirt_install(opts, disk_img, disk_size, repo_url)
else: else:
install_log = os.path.abspath(os.path.dirname(opts.logfile))+"/virt-install.log" install_log = os.path.abspath(os.path.dirname(opts.logfile))+"/virt-install.log"
log.info("install_log = %s", install_log) log.info("install_log = %s", install_log)