x-move/iconograph
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add kernel arg passing support

Browse Source
This commit is contained in:
Ian Gulliver
2016-04-22 21:19:29 +00:00
parent 5de9a8d2c6
commit 5952adfd55
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/build_image.py
View File

@@ -25,6 +25,10 @@ parser.add_argument(
dest='image_dir', dest='image_dir',
action='store', action='store',
required=True) required=True)
parser.add_argument(
'--kernel-arg',
dest='kernel_args',
action='append')
parser.add_argument( parser.add_argument(
'--module', '--module',
dest='modules', dest='modules',
@@ -87,13 +91,14 @@ class ImageBuilder(object):
'loopback.cfg': 'boot/grub/loopback.cfg', 'loopback.cfg': 'boot/grub/loopback.cfg',
} }
def __init__(self, source_iso, image_dir, archive, arch, release, modules): def __init__(self, source_iso, image_dir, archive, arch, release, modules, kernel_args):
self._source_iso = source_iso self._source_iso = source_iso
self._image_dir = image_dir self._image_dir = image_dir
self._archive = archive self._archive = archive
self._arch = arch self._arch = arch
self._release = release self._release = release
self._modules = modules or [] self._modules = modules or []
self._kernel_args = kernel_args or []
self._ico_server_path = os.path.dirname(sys.argv[0]) self._ico_server_path = os.path.dirname(sys.argv[0])
@@ -259,9 +264,11 @@ class ImageBuilder(object):
def _CopyISOFiles(self, union_path): def _CopyISOFiles(self, union_path):
for source, dest in self._ISO_COPIES.items(): for source, dest in self._ISO_COPIES.items():
shutil.copyfile( source_path = os.path.join(self._ico_server_path, 'iso_files', source)
os.path.join(self._ico_server_path, 'iso_files', source), dest_path = os.path.join(union_path, dest)
os.path.join(union_path, dest)) with open(source_path, 'r') as source_fh, open(dest_path, 'w') as dest_fh:
for line in source_fh:
dest_fh.write(line.replace('$KERNEL_ARGS', ' '.join(self._kernel_args)))
def _CreateISO(self, union_path, timestamp): def _CreateISO(self, union_path, timestamp):
dest_iso = os.path.join(self._image_dir, '%d.iso' % timestamp) dest_iso = os.path.join(self._image_dir, '%d.iso' % timestamp)
@@ -322,7 +329,8 @@ def main():
FLAGS.archive, FLAGS.archive,
FLAGS.arch, FLAGS.arch,
FLAGS.release, FLAGS.release,
FLAGS.modules) FLAGS.modules,
FLAGS.kernel_args)
builder.BuildImage() builder.BuildImage()

2
server/iso_files/grub.cfg
View File

@@ -2,6 +2,6 @@ set timeout=5
terminal_output console terminal_output console
menuentry "Ubuntu Server Live Image" { menuentry "Ubuntu Server Live Image" {
linux /casper/vmlinuz.efi boot=casper root=LABEL=ISOIMAGE nomodeset linux /casper/vmlinuz.efi boot=casper root=LABEL=ISOIMAGE nomodeset $KERNEL_ARGS
initrd /casper/initrd.lz initrd /casper/initrd.lz
} }

2
server/iso_files/loopback.cfg
View File

@@ -2,6 +2,6 @@ set timeout=5
terminal_output console terminal_output console
menuentry "Ubuntu Server Live Image" { menuentry "Ubuntu Server Live Image" {
linux /casper/vmlinuz.efi boot=casper iso-scan/filename=${iso_path} nomodeset linux /casper/vmlinuz.efi boot=casper iso-scan/filename=${iso_path} nomodeset $KERNEL_ARGS
initrd /casper/initrd.lz initrd /casper/initrd.lz
} }