Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow image.yaml to specify extra kernel args #525

Merged
merged 1 commit into from
May 17, 2019
Merged

Allow image.yaml to specify extra kernel args #525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/image-base.ks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ firewall --disabled
# prjquota is for quota enablement for containers: https://bugzilla.redhat.com/show_bug.cgi?id=1658386
# rw and $ignition_firstboot are used by https://github.com/coreos/ignition-dracut/
# Console settings are so we see output everywhere
bootloader --timeout=1 --append="console=ttyS0,115200n8 console=tty0 rootflags=defaults,prjquota rw $ignition_firstboot"
# %%KARGS%% is for distro-specific arguments
bootloader --timeout=1 --append="console=ttyS0,115200n8 console=tty0 rootflags=defaults,prjquota rw %%KARGS%% $ignition_firstboot"
# Anaconda currently writes out configs for this which we don't want to persist; see below
network --bootproto=dhcp --onboot=on

Expand Down
15 changes: 8 additions & 7 deletions src/virt-install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# one or both.

import os,sys,argparse,subprocess,io,time,re,multiprocessing
import tempfile,shutil,yaml,platform,json,threading
import tempfile,yaml,platform,json,threading
import http.server
import socketserver

Expand All @@ -27,7 +27,7 @@ def fatal(msg):
raise SystemExit(1)

# Set of valid keys in image.yaml
IMAGE_CONF_KEYS = ['size', 'postprocess-script']
IMAGE_CONF_KEYS = ['size', 'postprocess-script', 'extra-kargs']

parser = argparse.ArgumentParser()
parser.add_argument("--dest", help="Destination disk",
Expand Down Expand Up @@ -107,17 +107,18 @@ if args.kickstart_out:
else:
ks_tmp = tempfile.NamedTemporaryFile(mode='w', prefix="coreos-virtinstall", suffix=".ks")

disk_size = None

with open('/usr/lib/coreos-assembler/image-base.ks') as basef:
shutil.copyfileobj(basef, ks_tmp)
image_conf = None
with open(args.configdir + '/image.yaml') as f:
image_conf = yaml.safe_load(f)
for k in image_conf:
if not k in IMAGE_CONF_KEYS:
fatal(f"Unknown key '{k}' in image.yaml")
disk_size = int(image_conf['size'])
extra_kargs = image_conf.get('extra-kargs', [])

with open('/usr/lib/coreos-assembler/image-base.ks') as basef:
buf = basef.read()
buf = buf.replace('%%KARGS%%', ' '.join(extra_kargs))
ks_tmp.write(buf)

# To support different distro builds using Fedora anaconda,
# installclass must be explicit for anaconda to find the correct directory.
Expand Down